X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=4b6eeef7a229797ba1b62eaebd84432e1e7f459b;hb=900eb2adaaa06f024246a217b44226ef8754b233;hp=5be9aef4e12bb5a6fc1810abbcbd02322f452ff9;hpb=221ad2139824219bf49e3d9fb4b88f4ee4cb8b26;p=packages%2Frpm.git diff --git a/rpm.spec b/rpm.spec index 5be9aef..4b6eeef 100644 --- a/rpm.spec +++ b/rpm.spec @@ -31,7 +31,7 @@ %define reqdb_ver 5.2 %define reqdb_pkgver 5.2.36.0-4 %define reqpopt_ver 1.15 -%define beecrypt_ver 2:4.1.2-4 +%define beecrypt_ver 2:4.2.0 %define sover 5.4 Summary: RPM Package Manager @@ -156,6 +156,7 @@ Patch71: %{name}-changelog-encoding.patch Patch72: %{name}-preserve-tag-type.patch Patch73: gem_helper-spec-arg.patch Patch74: rpm-fix-internal-lua-build.patch +Patch75: rpm-double_check_file_deps.patch # Patches imported from Mandriva @@ -895,6 +896,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch72 -p1 %patch73 -p1 %patch74 -p1 +%patch75 -p1 %patch1000 -p1 %patch1001 -p1 @@ -988,7 +990,7 @@ sed -i \ %{?with_python:--with-python=%{py_ver} --with-python-lib-dir=%{py_sitedir}} \ %{!?with_python:--without-python} \ --with-selinux=%{!?with_selinux:no}%{?with_selinux:external} \ - --with-sepol=%{!?with_selinux:not}%{?with_selinux:external} \ + --with-sepol=%{!?with_selinux:no}%{?with_selinux:external} \ --with-semanage=%{!?with_selinux:no}%{?with_selinux:external} \ --with-libelf \ --with-zlib=external \ @@ -1039,7 +1041,7 @@ install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm} \ install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc -%{__make} install \ +%{__make} -j1 install \ pkgconfigdir=%{_pkgconfigdir} \ DESTDIR=$RPM_BUILD_ROOT