]> git.pld-linux.org Git - packages/rpm.git/blobdiff - rpm.spec
behaves like it's built --with system_lua with filelists
[packages/rpm.git] / rpm.spec
index 6944aa37190d2cb3a4d46145f885a388837924eb..d22e650f5af72d72f89d07524fa307ff768c0aed 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -50,13 +50,14 @@ Summary(pt_BR.UTF-8):       Gerenciador de pacotes RPM
 Summary(ru.UTF-8):     Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
-Version:       5.4.15
-Release:       27
+Version:       5.4.16
+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.20160420.src.rpm
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 4067f83ca8b5bf1a21e443c0cff3efa0
+# 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
@@ -129,7 +130,7 @@ Patch34:    %{name}-libmagic-locale.patch
 Patch35:       %{name}-namespace-compare.patch
 Patch36:       %{name}-popt-coreutils.patch
 Patch37:       %{name}-postun-nofail.patch
-Patch38:       %{name}-silence-RPM_CHAR_TYPE.patch
+
 Patch39:       %{name}-fix-missing-types-in-headers.patch
 Patch40:       %{name}-fix--p-interpreter-and-empty-script.patch
 Patch41:       %{name}-db_buffer_small.patch
@@ -156,17 +157,16 @@ Patch62:  %{name}-DB_CONFIG.patch
 Patch63:       %{name}-pythoneggs.patch
 Patch64:       %{name}-fix-compress-doc.patch
 Patch65:       %{name}-parseSpec-skip-empty-tags.patch
-Patch66:       %{name}-payload-use-hashed-inode.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
 Patch78:       %{name}-double_check_unpackaged_subdirs.patch
 Patch79:       %{name}-rpmspec.patch
-Patch80:       %{name}-revert-gpg-argv-parsing.patch
+
 Patch81:       %{name}-perl-magic.patch
 Patch82:       %{name}-5.4.15-use-DSA-sig.patch
 Patch83:       %{name}-ignore-missing-macro-files.patch
@@ -179,6 +179,7 @@ Patch89:    disable-header-verification.patch
 Patch90:       %{name}-cppcompat.patch
 Patch91:       py-disable-fetch.patch
 Patch92:       fast_python_deps.patch
+Patch93:       python2_explicit.patch
 
 # Patches imported from Mandriva
 
@@ -236,8 +237,6 @@ Patch1021:  %{name}-5.4.7-kmod-dependencies.patch
 Patch1022:     %{name}-5.4.5-skip-dependencies-for-character-devices.patch
 # status: probably okay to merge
 Patch1024:     %{name}-5.4.5-rpmfc-apply-python-coloring-from-magic.patch
-# status: probably okay to merge
-Patch1026:     %{name}-5.4.10-dont-try-generate-rpmfc-dependencies-from-doc-files.patch
 # status: ready
 Patch1027:     %{name}-5.4.7-fix-generation-of-ruby-abi-provides.patch
 # crash reproducable with 'rpm -qa --triggers'
@@ -253,8 +252,6 @@ Patch1031:  %{name}-5.4.9-mire-fix-strings-lacking-null-terminator.patch
 Patch1032:     %{name}-5.4.9-rpmpython-fix-input.patch
 # status: ready
 Patch1033:     %{name}-5.4.7-no-seqid_init-on-rdonly-database.patch
-# status: probably ready for merging
-Patch1034:     %{name}-5.4.9-avoid-double-slash-in-path-for-dirname-filetrigger-matching.patch
 # status: probably ready to merge, discuss on rpm-devel first
 Patch1035:     %{name}-5.4.9-fix-verify-segfault.patch
 # Due to rpmdav/neon being written in a different fashion than other rpmio clients,
@@ -282,12 +279,9 @@ Patch1040: %{name}-5.4.9-support-signatures-and-digest-disablers.patch
 Patch1041:     %{name}-5.4.9-disable-l10ndir.patch
 # status: ready for merge
 Patch1042:     %{name}-5.4.9-fix-rpm_qa-pattern.patch
-# warning: introduces memory leak
-Patch1043:     %{name}-5.4.12-copy-Value-string.patch
 Patch1044:     %{name}-5.4.12-fix-rpmlua-print.patch
 Patch1045:     %{name}-5.4.12-fix-rpmpython-module-import-init.patch
-Patch1046:     %{name}-5.4.12-truncate-output-buffer-after-use.patch
-Patch1047:     %{name}-5.4.13-perl-bindings-do-not-use-xmalloc.patch
+
 # proyvind:
 # there's a rpmdbchk tool I wrote a while back, which might help you. although
 # the incidents it's able to deal with is rather limited ATM... it might help
@@ -295,8 +289,6 @@ Patch1047:  %{name}-5.4.13-perl-bindings-do-not-use-xmalloc.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
 
@@ -675,7 +667,7 @@ Summary(uk.UTF-8):  Скрипти та утиліти, необхідні для
 Group:         Applications/File
 Requires(pretrans):    coreutils
 Requires(pretrans):    findutils
-Requires:      %{name}-build-macros >= 1.699
+Requires:      %{name}-build-macros >= 1.712
 Requires:      %{name}-utils = %{version}-%{release}
 Requires:      /bin/id
 Requires:      awk
@@ -891,7 +883,7 @@ cd -
 %patch11 -p1
 %endif
 %patch12 -p1
-%patch13 -p1
+#%patch13 -p1 NEEDS UPDATING
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
@@ -917,7 +909,7 @@ cd -
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
-%patch38 -p1
+
 %patch39 -p1
 %patch40 -p1
 %{?with_db61:%patch41 -p1}
@@ -944,17 +936,16 @@ cd -
 %patch63 -p1
 %patch64 -p1
 %patch65 -p1
-%patch66 -p1
+
 %patch67 -p1
 %patch70 -p1
 %patch71 -p1
-%patch72 -p1
 %patch74 -p1
 %patch75 -p1
-%patch77 -p0
+%patch77 -p1
 %patch78 -p1
 %patch79 -p1
-%patch80 -p1
+
 %patch81 -p0
 %patch82 -p1
 %patch84 -p1
@@ -989,7 +980,6 @@ cd -
 %patch1021 -p1
 %patch1022 -p1
 %patch1024 -p1
-%patch1026 -p1
 %patch1027 -p1
 %patch1028 -p1
 %patch1029 -p1
@@ -997,25 +987,24 @@ cd -
 %patch1031 -p1
 %patch1032 -p1
 %patch1033 -p1
-%patch1034 -p1
+
 %patch1035 -p1
 %patch1037 -p1
 %patch1038 -p1
 %patch1039 -p1
 %patch1040 -p1
-# don't delete, may be usefull if jbj descides to enable this again
+# don't delete, may be useful if jbj decides to enable this again
 #%patch1041 -p1
 %patch1042 -p1
-%patch1043 -p1
-%patch1044 -p1
+
+#%patch1044 -p1 RECHECK
 %patch1045 -p1
-%patch1046 -p1
-%patch1047 -p1
+
 %patch1048 -p1
-%patch1049 -p1
 
 %patch83 -p1
 %patch92 -p1
+%patch93 -p1
 
 %patch1050 -p1
 
@@ -1067,10 +1056,13 @@ sed -i \
        --enable-shared \
        --enable-static \
        %{!?with_apidocs:--without-apidocs} \
+       --with-usecrypto=beecrypt \
        --with-beecrypt=external \
+       --with-tomcrypt=no \
        --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} \
@@ -1261,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
 
@@ -1331,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
This page took 0.065754 seconds and 4 git commands to generate.