X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=82e376848ea76892164b5dba500558e27091327a;hb=51804d7b37f88c82f3e672f0310322ae05d98db8;hp=1aa4eb38b27d060f7d4e78ce5d8789d1f9c664e5;hpb=7e8b651a8d7789676232e70c9aa72159b2592efe;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index 1aa4eb3..82e3768 100644 --- a/rpm.spec +++ b/rpm.spec @@ -11,10 +11,10 @@ %bcond_without audit # audit plugin %bcond_without selinux # SELinux plugin %bcond_without systemd # systemd inhibit plugin +%bcond_without fsverity # fsverity plugin -%define db_ver 5.3.28.0 %define popt_ver 1.15 -%define sover 9.1.3 +%define sover 9.2.0 %if "%{_rpmversion}" >= "4.12" && "%{_rpmversion}" < "5" %define with_recommends_tags 1 @@ -33,13 +33,13 @@ Summary(pt_BR.UTF-8): Gerenciador de pacotes RPM Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm -Version: 4.16.1.3 -Release: 16 +Version: 4.17.0 +Release: 0.1 Epoch: 1 License: GPL v2 / LGPL v2.1 Group: Base -Source0: http://ftp.rpm.org/releases/rpm-4.16.x/%{name}-%{version}.tar.bz2 -# Source0-md5: 576277fafa5d0681a8a92c8716aca5f0 +Source0: http://ftp.rpm.org/releases/rpm-4.17.x/%{name}-%{version}.tar.bz2 +# Source0-md5: ba23b5d2403fd2f9163dfd0dadce1820 Source1: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc # Source1-md5: 23914bb49fafe7153cee87126d966461 Source2: macros.local @@ -56,6 +56,8 @@ Source12: %{name}.noautoprovfiles Source13: %{name}.noautoreq Source14: %{name}.noautoreqfiles Source15: perl.prov +Source16: libtooldeps.sh +Source17: libtool.attr Patch0: %{name}-man_pl.patch Patch1: %{name}-popt-aliases.patch Patch2: %{name}-perl-macros.patch @@ -64,7 +66,6 @@ Patch4: %{name}-scripts-closefds.patch Patch5: %{name}-dir-macros-relative.patch Patch6: %{name}-perl_req-INC_dirs.patch Patch7: %{name}-debuginfo.patch -Patch8: %{name}-libtool-deps.patch Patch9: %{name}-builddir-readlink.patch Patch10: %{name}-changelog_order_check_nonfatal.patch Patch11: %{name}-postun-nofail.patch @@ -83,36 +84,31 @@ Patch23: shortcircuited-deps.patch Patch24: cpuinfo-deps.patch Patch25: rpmio-read-proc-files.patch Patch26: allow-at-in-ver-rel.patch -Patch27: no-exeonly-for-elf-reqprov.patch Patch28: default-patch-flags.patch Patch29: %{name}-noarch_py_prov.patch Patch30: missing-ghost-terminate-build.patch Patch31: missing-doc-terminate-build.patch Patch32: noexpand.patch -Patch33: sqlite-db-backend.patch Patch34: skip-symlinks.patch Patch35: pl-po.patch Patch36: build-locale.patch -Patch37: %{name}-pl.po-update.patch -Patch38: no-exe-for-elf-debuginfo.patch -Patch39: no-exe-for-elf-req.patch -Patch40: python-3.10-abi.patch +Patch37: no-exe-for-elf-req.patch +Patch38: gem-in-package-builddir.patch URL: https://rpm.org/ BuildRequires: acl-devel %{?with_audit:BuildRequires: audit-libs-devel} BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.10 BuildRequires: bzip2-devel >= 1.0.2-17 -BuildRequires: db-devel >= %{db_ver} -%{?with_systemd:BuildRequires: dbus-devel >= 1.3} +%{?with_plugins:BuildRequires: dbus-devel >= 1.3} BuildRequires: elfutils-devel >= 0.108 BuildRequires: gettext-tools >= 0.19.2 %{?with_imaevm:BuildRequires: ima-evm-utils-devel >= 1.0} BuildRequires: libarchive-devel BuildRequires: libcap-devel -BuildRequires: libmagic-devel BuildRequires: libgcrypt-devel BuildRequires: libgomp-devel >= 6:4.5 +BuildRequires: libmagic-devel %{?with_selinux:BuildRequires: libselinux-devel >= 2.1.0} # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros BuildRequires: libstdc++-devel @@ -142,10 +138,10 @@ BuildRequires: tetex-pdftex Requires(posttrans): coreutils Requires: %{name}-base = %{epoch}:%{version}-%{release} Requires: %{name}-lib = %{epoch}:%{version}-%{release} -Requires: rpm-pld-macros >= 2.002 Requires: FHS >= 3.0-2 Requires: libgcrypt Requires: popt >= %{popt_ver} +Requires: rpm-pld-macros >= 2.002 %if %{with recommends_tags} Recommends: rpm-plugin-audit Recommends: rpm-plugin-prioreset @@ -246,7 +242,6 @@ Zawiera on: Summary: RPMs library Summary(pl.UTF-8): Biblioteki RPM-a Group: Libraries -Requires: db >= %{db_ver} Requires: libmagic >= 1.15-2 Requires: popt >= %{popt_ver} Requires: sqlite3-libs >= 3.22.0 @@ -271,10 +266,9 @@ Summary(uk.UTF-8): Хедери та бібліотеки для програм, Group: Development/Libraries Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires: bzip2-devel -Requires: db-devel >= %{db_ver} Requires: elfutils-devel -Requires: libmagic-devel Requires: libgcrypt-devel +Requires: libmagic-devel %if %{with selinux} Requires: libselinux-devel Requires: libsemanage-devel @@ -362,17 +356,18 @@ Group: Applications/File Requires(pretrans): coreutils Requires(pretrans): findutils Requires: %{name}-utils = %{epoch}:%{version}-%{release} -Requires: rpm-pld-macros-build >= 1.744 Requires: /bin/id Requires: awk Requires: bzip2 Requires: chrpath >= 0.10-4 Requires: cpio +Requires: debugedit Requires: diffutils Requires: elfutils Requires: file >= 4.17 Requires: fileutils Requires: findutils +Requires: rpm-pld-macros-build >= 1.744 %ifarch athlon Requires: gcc >= 3.0.3 %else @@ -437,23 +432,6 @@ Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen. Dodatkowe narzędzia do sprawdzenia zależności skryptów Perla w pakietach RPM. -%package pythonprov -Summary: Python macros, which simplifies creation of RPM packages with Python software -Summary(pl.UTF-8): Makra ułatwiające tworzenie pakietów RPM z programami napisanymi w Pythonie -Group: Applications/File -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: python3 -Requires: python3-modules -Requires: python3-setuptools - -%description pythonprov -Python macros, which simplifies creation of RPM packages with Python -software. - -%description pythonprov -l pl.UTF-8 -Makra ułatwiające tworzenie pakietów RPM z programami napisanymi w -Pythonie. - %package -n python3-rpm Summary: Python 3 interface to RPM library Summary(pl.UTF-8): Interfejs Pythona 3 do biblioteki RPM-a @@ -539,8 +517,8 @@ This plugin adds support for enforcing and verifying IMA file signatures in an rpm. %description plugin-ima -l pl.UTF-8 -Ta wtyczka dodaje obsługę wymuszania i weryfikacji podpisów plików -IMA w RPM-ie. +Ta wtyczka dodaje obsługę wymuszania i weryfikacji podpisów plików IMA +w RPM-ie. %package plugin-prioreset Summary: Plugin for resetting scriptlet priorities for SysV init @@ -571,6 +549,36 @@ Plugin for SELinux functionality. %description plugin-selinux -l pl.UTF-8 Wtyczka do funkcjonalności SELinux. +%package plugin-fsverity +Summary: Plugin for fsverity file signatures +Group: Base +Requires: %{name}-lib = %{epoch}:%{version}-%{release} + +%description plugin-fsverity +Plugin for fsverity file signatures. + +%package plugin-fapolicyd +Summary: Plugin for fapolicyd support +Group: Base +Requires: %{name}-lib = %{epoch}:%{version}-%{release} + +%description plugin-fapolicyd +Plugin for fapolicyd support. + +See https://people.redhat.com/sgrubb/fapolicyd/ for information about +the fapolicyd daemon. + +%package plugin-dbus-announce +Summary: Plugin for announcing transactions on the DBUS +Group: Base +Requires: %{name}-lib = %{epoch}:%{version}-%{release} + +%description plugin-dbus-announce +The plugin announces basic information about rpm transactions to the +system DBUS - like packages installed or removed. Other programs can +subscribe to the signals to get notified when packages on the system +change. + %package sign Summary: Package signing support Summary(pl.UTF-8): Obsługa podpisywania pakietów @@ -607,8 +615,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch5 -p1 %patch6 -p0 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 +#%patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 @@ -626,20 +633,16 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch24 -p1 %patch25 -p1 %patch26 -p1 -%patch27 -p1 %patch28 -p1 -%patch29 -p1 +#%patch29 -p1 %patch30 -p1 %patch31 -p1 %patch32 -p1 -%patch33 -p1 %patch34 -p1 %patch35 -p1 %patch36 -p1 %patch37 -p1 %patch38 -p1 -%patch39 -p1 -%patch40 -p1 %{__rm} po/*.gmo @@ -650,8 +653,6 @@ install %{SOURCE15} scripts/perl.prov.in # generate Group translations to *.po awk -f %{SOURCE6} %{SOURCE5} -%{__sed} -i -e '1s,/usr/bin/python,%{__python3},' scripts/pythondistdeps.py - %build %{__libtoolize} %{__aclocal} @@ -671,7 +672,6 @@ awk -f %{SOURCE6} %{SOURCE5} WITH_PERL_VERSION=no \ __GST_INSPECT=%{_bindir}/gst-inspect-1.0 \ __GPG=%{_bindir}/gpg \ - --enable-bdb \ --enable-bdb-ro \ --enable-ndb \ %{!?with_plugins:--disable-plugins} \ @@ -683,8 +683,8 @@ awk -f %{SOURCE6} %{SOURCE5} --with-archive \ --with-audit%{!?with_audit:=no} \ --with-cap \ + --with-fapolicyd \ %{?with_imaevm:--with-imaevm} \ - --with-lua \ %{?with_python3:--enable-python} \ --with-selinux%{!?with_selinux:=no} \ --with-vendor=pld @@ -779,6 +779,9 @@ cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreq cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoreqfiles +cp -p %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/libtooldeps.sh +cp -p %{SOURCE17} $RPM_BUILD_ROOT%{_rpmlibdir}/fileattrs/libtool.attr + # move rpm to /bin %{__mv} $RPM_BUILD_ROOT%{_bindir}/rpm $RPM_BUILD_ROOT/bin ln -sf /bin/rpm $RPM_BUILD_ROOT%{_bindir}/rpmquery @@ -979,9 +982,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_bindir}/rpm2cpio %attr(755,root,root) %{_bindir}/rpmgraph %attr(755,root,root) %{_rpmlibdir}/rpm2cpio.sh -%attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh %attr(755,root,root) %{_rpmlibdir}/tgpg -%attr(755,root,root) %{_rpmlibdir}/debugedit %attr(755,root,root) %{_rpmlibdir}/rpmdeps %{_mandir}/man8/rpm2archive.8* %{_mandir}/man8/rpm2cpio.8* @@ -1027,7 +1028,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %attr(755,root,root) %{_rpmlibdir}/find-requires %attr(755,root,root) %{_rpmlibdir}/ocamldeps.sh %attr(755,root,root) %{_rpmlibdir}/script.req -%attr(755,root,root) %{_rpmlibdir}/sepdebugcrcfix %dir %{_rpmlibdir}/fileattrs %{_rpmlibdir}/fileattrs/debuginfo.attr @@ -1040,8 +1040,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %{_rpmlibdir}/fileattrs/perl.attr %{_rpmlibdir}/fileattrs/perllib.attr %{_rpmlibdir}/fileattrs/pkgconfig.attr -%{_rpmlibdir}/fileattrs/python.attr -%{_rpmlibdir}/fileattrs/pythondist.attr %{_rpmlibdir}/fileattrs/script.attr %attr(755,root,root) %{_bindir}/gendiff @@ -1059,10 +1057,6 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %defattr(644,root,root,755) %attr(755,root,root) %{_rpmlibdir}/perl.* -%files pythonprov -%defattr(644,root,root,755) -%attr(755,root,root) %{_rpmlibdir}/pythondistdeps.py - %if %{with python3} %files -n python3-rpm %defattr(644,root,root,755) @@ -1105,6 +1099,23 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/rpm-plugins/selinux.so %{_mandir}/man8/rpm-plugin-selinux.8* + +%if %{with fsverity} +%files plugin-fsverity +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/rpm-plugins/fsverity.so +%endif + +%files plugin-fapolicyd +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/rpm-plugins/fapolicyd.so +%{_mandir}/man8/rpm-plugin-fapolicyd.8* + +%files plugin-dbus-announce +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/rpm-plugins/dbus_announce.so +%{_mandir}/man8/rpm-plugin-dbus-announce.8* +%{_sysconfdir}/dbus-1/system.d/org.rpm.conf %endif %files sign @@ -1115,5 +1126,5 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f %if %{with apidocs} %files apidocs %defattr(644,root,root,755) -%doc doc/librpm/html/* +%doc docs/librpm/html/* %endif