From 235fbcebfed8e471417d347fb6a2bf7fa3ad2cc1 Mon Sep 17 00:00:00 2001 From: happy_orange Date: Tue, 11 Oct 2022 03:48:07 -0400 Subject: [PATCH] change the filter matching rules for abi and api --- abi.attr | 2 +- api.attr | 2 +- system-rpm-config.spec | 128 +++++++++++++++++++++-------------------- 3 files changed, 68 insertions(+), 64 deletions(-) diff --git a/abi.attr b/abi.attr index 4096e72..ea38bda 100644 --- a/abi.attr +++ b/abi.attr @@ -1,2 +1,2 @@ %__abi_provides %{_rpmconfigdir}/compatibiliy-deps.sh abi %{name} %{version} -%__abi_path ^/usr/lib/compatibility/[^/]+/[^/]+abi\.tar\.gz$ +%__abi_path ^/usr/lib/compatibility/[^/]+/[^/]+\.dump$ diff --git a/api.attr b/api.attr index a50d8cf..25defec 100644 --- a/api.attr +++ b/api.attr @@ -1,2 +1,2 @@ %__api_provides %{_rpmconfigdir}/compatibiliy-deps.sh api %{name} %{version} -%__api_path ^/usr/lib/compatibility/[^/]+/[^/]+api\.tar\.gz$ +%__api_path ^/usr/lib/compatibility/[^/]+/[^/]+*\.option.list$ diff --git a/system-rpm-config.spec b/system-rpm-config.spec index e82bf82..8e38ec5 100644 --- a/system-rpm-config.spec +++ b/system-rpm-config.spec @@ -1,108 +1,109 @@ -%define anolis_release 7 -Summary: Anolis OS specific rpm configuration files -Name: system-rpm-config -Version: 23 -Release: %{anolis_release}%{?dist} -License: MulanPSLv2 -URL: https://gitee.com/src-anolis-os/system-rpm-config +%define anolis_release 8 +%global rrcdir /usr/lib/rpm/anolis + +Summary: Anolis OS specific rpm configuration files +Name: system-rpm-config +Version: 23 +Release: %{anolis_release}%{?dist} +License: MulanPSLv2 +URL: https://gitee.com/src-anolis-os/system-rpm-config # Core rpm settings -Source0: macros -Source1: rpmrc +Source0: macros +Source1: rpmrc -Source10: MulanPSL +Source10: MulanPSL # gcc specs files for hardened builds -Source50: anolis-hardened-cc1 -Source51: anolis-hardened-ld -Source52: anolis-hardened-clang.cfg +Source50: anolis-hardened-cc1 +Source51: anolis-hardened-ld +Source52: anolis-hardened-clang.cfg # gcc specs files for annobin builds -Source60: anolis-annobin-cc1 +Source60: anolis-annobin-cc1 # The macros defined by these files are for things that need to be defined # at srpm creation time when it is not feasible to require the base packages # that would otherwise be providing the macros. other language/arch specific # macros should not be defined here but instead in the base packages that can # be pulled in at rpm build time, this is specific for srpm creation. -Source100: macros.anolis-misc-srpm -Source101: macros.nodejs-srpm -Source102: macros.java-srpm +Source100: macros.anolis-misc-srpm +Source101: macros.nodejs-srpm +Source102: macros.java-srpm # Other misc macros -Source151: macros.dwz -Source152: macros.anolis-misc -Source153: macros.ldconfig +Source151: macros.dwz +Source152: macros.anolis-misc +Source153: macros.ldconfig # meson depend on this -Source154: macros.vpath -Source155: macros.forge -Source156: macros.shell-completions +Source154: macros.vpath +Source155: macros.forge +Source156: macros.shell-completions # Build policy scripts # this comes from https://github.com/rpm-software-management/rpm/pull/344 -Source201: brp-mangle-shebangs +Source201: brp-mangle-shebangs # for converting llvm LTO bitcode objects into ELF -Source202: brp-llvm-compile-lto-elf +Source202: brp-llvm-compile-lto-elf # Dependency generator scripts (deprecated) -Source300: find-provides -Source301: find-requires +Source300: find-provides +Source301: find-requires # Misc helper scripts -Source400: dist.sh -Source401: gpgverify -Source402: remove-info-dir +Source400: dist.sh +Source401: gpgverify +Source402: remove-info-dir # 2022-05-25 Snapshots from http://git.savannah.gnu.org/gitweb/?p=config.git -Source500: config.guess -Source501: config.sub +Source500: config.guess +Source501: config.sub # Dependency generators & their rules -Source602: libsymlink.attr +Source602: libsymlink.attr # BRPs -Source700: brp-ldconfig -Source701: brp-strip-lto +Source700: brp-ldconfig +Source701: brp-strip-lto # Convenience lua functions -Source800: common.lua -Source801: forge.lua +Source800: common.lua +Source801: forge.lua -Source900: compatibiliy-deps.sh -Source901: abi.attr -Source902: api.attr +Source900: compatibiliy-deps.sh +Source901: abi.attr +Source902: api.attr -BuildArch: noarch -BuildRequires: perl-generators -Requires: coreutils +BuildArch: noarch +BuildRequires: perl-generators +Requires: coreutils -Requires: rpm >= 4.11.0 -Requires: dwz >= 0.4 -Requires: zip -Requires: (annobin-plugin-gcc if gcc) +Requires: rpm >= 4.11.0 +Requires: dwz >= 0.4 +Requires: zip +Requires: (annobin-plugin-gcc if gcc) # for brp-mangle-shebangs -Requires: %{_bindir}/find -Requires: %{_bindir}/file -Requires: %{_bindir}/grep -Requires: %{_bindir}/sed -Requires: %{_bindir}/xargs +Requires: %{_bindir}/find +Requires: %{_bindir}/file +Requires: %{_bindir}/grep +Requires: %{_bindir}/sed +Requires: %{_bindir}/xargs # for brp-llvm-compile-lto-elf -Requires: (llvm if clang) +Requires: (llvm if clang) -Provides: system-rpm-config = %{version}-%{release} +Provides: system-rpm-config = %{version}-%{release} # Temporarily provides, will remove after all packages build -Provides: redhat-rpm-config = 2023 -Obsoletes: redhat-rpm-config +Provides: redhat-rpm-config = 2023 +Obsoletes: redhat-rpm-config -Requires: go-srpm-macros -Requires: python3-rpm-macros -Requires: efi-srpm-macros -Requires: perl-srpm-macros -Requires: rust-srpm-macros +Requires: go-srpm-macros +Requires: python3-rpm-macros +Requires: efi-srpm-macros +Requires: perl-srpm-macros +Requires: rust-srpm-macros -%global rrcdir /usr/lib/rpm/anolis %description Anolis OS specific rpm configuration files. @@ -172,6 +173,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/anolis/srpm forge.lua %license MulanPSL %changelog +* Tue Oct 11 2022 happy_orange - 23.8 +- change the filter matching rules for abi and api fileattr. + * Sun Oct 09 2022 Funda Wang - 23.7 - add remove-info-dir script from mandriva/mageia for automatically removal of unwanted /usr/share/info/dir -- Gitee