behaves like it's built --with system_lua with filelists

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 87349ebb1cb7e8625b93a94c2f3f5ce3bf1b7357..d22e650f5af72d72f89d07524fa307ff768c0aed 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -55,9 +55,9 @@ Release:      0.1
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
-# http://rpm5.org/files/rpm/rpm-5.4/SNAPSHOT/rpm-5.4.16-0.20160315.src.rpm
+# http://rpm5.org/files/rpm/rpm-5.4/SNAPSHOT/rpm-5.4.16-0.20160420.src.rpm
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: f96fa6d4d418b2ec6df8ba4b7cb2985a
+# Source0-md5: 807a9a78da44218eb836b9348227f5fb
 # See README.cpu-os-macros how to update cpu-os-macros.a
 Source100:     cpu-os-macros.a
 Source101:     README.cpu-os-macros
@@ -161,7 +161,6 @@ Patch65:    %{name}-parseSpec-skip-empty-tags.patch
 Patch67:       %{name}-repackage-dont-force-max-compression.patch
 Patch70:       python-%{name}sense-missingok.patch
 Patch71:       %{name}-changelog-encoding.patch
-Patch72:       %{name}-preserve-tag-type.patch
 Patch74:       %{name}-fix-internal-lua-build.patch
 Patch75:       %{name}-double_check_file_deps.patch
 Patch77:       %{name}-lua-expat.patch
@@ -181,7 +180,6 @@ Patch90:    %{name}-cppcompat.patch
 Patch91:       py-disable-fetch.patch
 Patch92:       fast_python_deps.patch
 Patch93:       python2_explicit.patch
-Patch94:       do_not_write_before_macro_buffer.patch
 
 # Patches imported from Mandriva
 
@@ -291,8 +289,6 @@ Patch1045:  %{name}-5.4.12-fix-rpmpython-module-import-init.patch
 # stab at adding support for fixing your specific problem to the util ;)
 # https://abf.io/openmandriva/rpm/raw/master/rpm-5.4.14-rpmdbchk.patch
 Patch1048:     %{name}-5.4.14-rpmdbchk.patch
-# https://abf.io/openmandriva/rpm/raw/master/rpm-5.4.14-no-assert-abort-with-broken-headers.patch
-Patch1049:     %{name}-5.4.14-no-assert-abort-with-broken-headers.patch
 
 Patch1050:     python-libx32.patch
 
@@ -887,7 +883,7 @@ cd -
 %patch11 -p1
 %endif
 %patch12 -p1
-%patch13 -p1
+#%patch13 -p1 NEEDS UPDATING
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
@@ -944,10 +940,9 @@ cd -
 %patch67 -p1
 %patch70 -p1
 %patch71 -p1
-%patch72 -p1
 %patch74 -p1
 %patch75 -p1
-%patch77 -p0
+%patch77 -p1
 %patch78 -p1
 %patch79 -p1
 
@@ -1006,12 +1001,10 @@ cd -
 %patch1045 -p1
 
 %patch1048 -p1
-%patch1049 -p1
 
 %patch83 -p1
 %patch92 -p1
 %patch93 -p1
-%patch94 -p1
 
 %patch1050 -p1
 
@@ -1069,6 +1062,7 @@ sed -i \
        --with-bugreport="http://bugs.pld-linux.org/" \
        --with-bzip2=external \
        --with-db=external \
+       --with-acl=external \
        --with-dbapi=db \
        --with-file=external \
        --with-keyutils=%{?with_keyutils:external}%{!?with_keyutils:no} \
@@ -1259,8 +1253,10 @@ EOF
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
+%if %{without system_lua}
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/lib/liblua.a
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/lib/liblua.la
+%endif
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/mono-find-provides
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/mono-find-requires
 
@@ -1329,7 +1325,7 @@ mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,py}
 %endif
 
 # wrong location, not used anyway