diff --git a/rpm-5.2.1-build-fix-arm.patch b/rpm-5.2.1-build-fix-arm.patch new file mode 100644 index 0000000..2f543ba --- /dev/null +++ b/rpm-5.2.1-build-fix-arm.patch @@ -0,0 +1,11 @@ +--- rpm-5.2.1/file/src/softmagic.c.orig 2014-12-29 02:13:38.125162588 +0100 ++++ rpm-5.2.1/file/src/softmagic.c 2014-12-29 02:11:59.901539763 +0100 +@@ -33,7 +33,7 @@ + #include "magic.h" + #include + #if !(defined(HAVE_STRNDUP) && defined(__USE_GNU)) +-char * strndup(const char *, size_t); ++//char * strndup(const char *, size_t); + #endif + + #include diff --git a/rpm.spec b/rpm.spec index 81411d0..774ba53 100644 --- a/rpm.spec +++ b/rpm.spec @@ -33,7 +33,7 @@ Name: rpm Version: 5.2.1 -Release: 25mamba +Release: 26mamba Summary: The RPM package management system Group: System/Management Vendor: openmamba @@ -100,6 +100,7 @@ Patch61: rpm-5.2.1-debugedit-cvs-update.patch Patch62: rpm-5.2.1-python-2.7.patch Patch63: rpm-5.2.1-sourcepackage-rpm4.patch Patch64: rpm-5.2.1-build-from-tarball.patch +Patch65: rpm-5.2.1-build-fix-arm.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -111,18 +112,22 @@ BuildRequires: libcpuinfo-devel BuildRequires: libe2fs-devel BuildRequires: libelf-devel BuildRequires: libexpat-devel -BuildRequires: libkeyutils-devel %if "%{bootstrap}" != "1" BuildRequires: libkrb5-devel %endif +BuildRequires: liblzma-devel BuildRequires: libneon-devel BuildRequires: libopenssl-devel +BuildRequires: libperl BuildRequires: libpopt-devel +BuildRequires: libproxy-devel BuildRequires: libpython-devel BuildRequires: libstdc++6-devel +BuildRequires: libsyck-devel BuildRequires: libz-devel BuildRequires: perl-devel ## AUTOBUILDREQ-END +BuildRequires: libkeyutils-devel BuildRequires: libsyck-devel %if "%{bootstrap}" != "1" BuildRequires: libproxy-devel @@ -299,6 +304,7 @@ This package should be installed if you want to develop Python programs that wil %patch62 -p1 %patch63 -p1 %patch64 -p1 +%patch65 -p1 mkdir platform-macros cd platform-macros @@ -353,6 +359,7 @@ CC=%{_target_platform}-gcc \ --with-libelf \ --with-file \ --with-bzip2 \ + --with-xz=external \ --with-vendor=openmamba \ %if %{with_apidocs} --with-apidocs \ @@ -619,6 +626,9 @@ fi %endif %changelog +* Tue Oct 07 2014 Silvan Calarco 5.2.1-26mamba +- rebuilt with --with-xz to support rpmlib(PayloadIsXz) + * Thu Apr 24 2014 Silvan Calarco 5.2.1-25mamba - added a small patch to fix build from tarball (rpm -t[a|b|s])