diff --git a/rpm-4.17.0.tar.bz2 b/rpm-4.18.0.tar.bz2 similarity index 35% rename from rpm-4.17.0.tar.bz2 rename to rpm-4.18.0.tar.bz2 index 0aecf44db7f8691a253e8d2e05023c24d99bf304..37ea9292b836f201a6655a943e4ba7c7e47c2781 100644 Binary files a/rpm-4.17.0.tar.bz2 and b/rpm-4.18.0.tar.bz2 differ diff --git a/rpm.spec b/rpm.spec index 58cb171fcdfb088c3e98e7a5fa04d813264527ae..27a19306011601655f63aee1598e89ab0bac3b59 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,4 +1,4 @@ -%define anolis_release 4 +%define anolis_release 1 # run internal testsuite? # fakechroot is severely broken, disable it %bcond_with check @@ -24,7 +24,7 @@ %define rpmhome /usr/lib/rpm -%global rpmver 4.17.0 +%global rpmver 4.18.0 %global sover 9 %global srcver %{rpmver} @@ -49,7 +49,7 @@ Patch0: rpm-4.17.x-rpm_dbpath.patch License: GPLv2+ Requires: coreutils -Requires: popt%{_isa} >= 1.10.2.1 +Requires: popt >= 1.10.2.1 Requires: curl Obsoletes: python2-rpm < %{version}-%{release} @@ -73,7 +73,7 @@ BuildRequires: popt-devel >= 1.10.2 BuildRequires: file-devel BuildRequires: gettext-devel BuildRequires: ncurses-devel -BuildRequires: bzip2-devel >= 0.9.0c-2 +BuildRequires: bzip2-devel >= 0.9.0c BuildRequires: lua-devel >= 5.1 BuildRequires: libcap-devel BuildRequires: libacl-devel @@ -132,7 +132,7 @@ This package contains the RPM shared libraries. %package build-libs Summary: Libraries for building RPM packages License: GPLv2+ and LGPLv2+ with exceptions -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} %description build-libs This package contains the RPM shared libraries for building packages. @@ -140,7 +140,7 @@ This package contains the RPM shared libraries for building packages. %package sign-libs Summary: Libraries for signing RPM packages License: GPLv2+ and LGPLv2+ with exceptions -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} Requires: %{_bindir}/gpg2 %description sign-libs @@ -150,10 +150,10 @@ This package contains the RPM shared libraries for signing packages. Summary: Development files for manipulating RPM packages License: GPLv2+ and LGPLv2+ with exceptions Requires: %{name} = %{version}-%{release} -Requires: %{name}-libs%{_isa} = %{version}-%{release} -Requires: %{name}-build-libs%{_isa} = %{version}-%{release} -Requires: %{name}-sign-libs%{_isa} = %{version}-%{release} -Requires: popt-devel%{_isa} +Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-build-libs = %{version}-%{release} +Requires: %{name}-sign-libs = %{version}-%{release} +Requires: popt-devel %description devel This package contains the RPM C library and header files. These @@ -187,7 +187,7 @@ that are used to build packages using the RPM Package Manager. %package sign Summary: Package signing support -Requires: rpm-sign-libs%{_isa} = %{version}-%{release} +Requires: rpm-sign-libs = %{version}-%{release} %description sign This package contains support for digitally signing RPM packages. @@ -196,7 +196,7 @@ This package contains support for digitally signing RPM packages. Summary: Python 3 bindings for apps which will manipulate RPM packages BuildRequires: python3-devel %{?python_provide:%python_provide python3-%{name}} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Provides: %{name}-python3 = %{version}-%{release} Obsoletes: %{name}-python3 < %{version}-%{release} Obsoletes: platform-python-%{name} < %{version}-%{release} @@ -229,7 +229,7 @@ packages on a system. %if %{with plugins} %package plugin-selinux Summary: Rpm plugin for SELinux functionality -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} Requires: selinux-policy-base %description plugin-selinux @@ -237,14 +237,14 @@ Requires: selinux-policy-base %package plugin-syslog Summary: Rpm plugin for syslog functionality -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} %description plugin-syslog %{summary}. %package plugin-systemd-inhibit Summary: Rpm plugin for systemd inhibit functionality -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} %description plugin-systemd-inhibit This plugin blocks systemd from entering idle, sleep or shutdown while an rpm @@ -252,14 +252,14 @@ transaction is running using the systemd-inhibit mechanism. %package plugin-ima Summary: Rpm plugin ima file signatures -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} %description plugin-ima %{summary}. %package plugin-prioreset Summary: Rpm plugin for resetting scriptlet priorities for SysV init -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} %description plugin-prioreset %{summary}. @@ -269,21 +269,21 @@ nice/ionice priorities. Should not be used on systemd systems. %package plugin-audit Summary: Rpm plugin for logging audit events on package operations -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} %description plugin-audit %{summary}. %package plugin-fsverity Summary: Rpm plugin for fsverity file signatures -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} %description plugin-fsverity %{summary}. %package plugin-fapolicyd Summary: Rpm plugin for fapolicyd support -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} Provides: fapolicyd-plugin = %{version}-%{release} # fapolicyd-dnf-plugin currently at 1.0.4 Obsoletes: fapolicyd-dnf-plugin < 1.0.5 @@ -296,7 +296,7 @@ the fapolicyd daemon. %package plugin-dbus-announce Summary: Rpm plugin for announcing transactions on the DBUS -Requires: rpm-libs%{_isa} = %{version}-%{release} +Requires: rpm-libs = %{version}-%{release} %description plugin-dbus-announce The plugin announces basic information about rpm transactions to the @@ -414,7 +414,7 @@ if [ -d /var/lib/rpm ]; then done fi -%triggerun -- rpm < 4.17.0-7 +%triggerun -- rpm < 4.17.0 # Handle rpmdb migrate service on erasure of old to avoid ordering issues if [ -x /usr/bin/systemctl ]; then systemctl --no-reload preset rpmdb-migrate ||: @@ -538,11 +538,13 @@ fi %{_bindir}/rpmbuild %{_bindir}/gendiff %{_bindir}/rpmspec +%{_bindir}/rpmlua %{_mandir}/man1/gendiff.1* %{_mandir}/man8/rpmbuild.8* %{_mandir}/man8/rpmdeps.8* %{_mandir}/man8/rpmspec.8* +%{_mandir}/man8/rpmlua.8* %{rpmhome}/brp-* %{rpmhome}/check-* @@ -555,6 +557,7 @@ fi %{rpmhome}/mkinstalldirs %{rpmhome}/fileattrs/* %{rpmhome}/find-debuginfo.sh +%{rpmhome}/rpmuncompress %files sign %{_bindir}/rpmsign @@ -580,6 +583,9 @@ fi %doc docs/librpm/html/* %changelog +* Tue Sep 27 2022 mgb01105731 - 4.18.0-1 +- update to 4.18.0 + * Tue Mar 22 2022 Chunmei Xu - 4.17.0-4 - disable fsverity