X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=4ce9d4097ec3d0d3853579e85354e107cb896427;hp=659979f9b4739ab2652166607566278ee9ad8014;hb=46761559371d6e5e68c23c17286f4883562d0579;hpb=a4316b5afc30b9f3e8e667bcd44e4feccd020080 diff --git a/rpm.spec b/rpm.spec index 659979f..4ce9d40 100644 --- a/rpm.spec +++ b/rpm.spec @@ -26,7 +26,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.16.1.2 -Release: 0.3 +Release: 6 Epoch: 1 License: GPL v2 / LGPL v2.1 Group: Base @@ -81,6 +81,9 @@ 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 Patch100: build-id-links.patch URL: https://rpm.org/ BuildRequires: acl-devel @@ -569,8 +572,13 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 %patch100 -p1 +%{__rm} po/*.gmo + install %{SOURCE15} scripts/perl.prov.in %{__mv} -f scripts/perl.req{,.in} @@ -622,6 +630,8 @@ sed -i \ %{__make} +%{__make} -C po update-gmo + %if %{with python3} cd python %py3_build @@ -630,7 +640,7 @@ cd python %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/{rpm,pki/rpm-gpg}} \ - $RPM_BUILD_ROOT/var/lib/{banner,rpm} + $RPM_BUILD_ROOT{/var/lib/{banner,rpm},/usr/lib/.build-id} cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/TLD-Linux.asc @@ -861,6 +871,8 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f # valgrind suppression file for rpm %{_rpmlibdir}/rpm.supp +%dir /usr/lib/.build-id + %files base %defattr(644,root,root,755) %dir %{_sysconfdir}/rpm