From 541e4803c32f608d8a856965233ae5f6933cc3bc Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 2 Aug 2011 13:37:01 +0300 Subject: [PATCH 1/4] - update to 4.9.1.1 --- .gitignore | 1 + rpm-4.9.1-recurse-dir.patch | 43 ------------------------------------- rpm.spec | 10 ++++----- sources | 3 +-- 4 files changed, 7 insertions(+), 50 deletions(-) delete mode 100644 rpm-4.9.1-recurse-dir.patch diff --git a/.gitignore b/.gitignore index 75103aa..0ff1f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ rpm-4.8.1.tar.bz2 /rpm-4.9.0-rc1.tar.bz2 /rpm-4.9.0.tar.bz2 /rpm-4.9.1.tar.bz2 +/rpm-4.9.1.1.tar.bz2 diff --git a/rpm-4.9.1-recurse-dir.patch b/rpm-4.9.1-recurse-dir.patch deleted file mode 100644 index 48482ab..0000000 --- a/rpm-4.9.1-recurse-dir.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 27c56c58209ee7c890f34429e030bfdb39105084 -Author: Panu Matilainen -Date: Mon Jun 27 12:41:39 2011 +0300 - - Remove ugly isDir recurse prevention hack on build - - - We know if we're already fts-walking by the way addFile() gets called, - dont corrupt fl->isDir for no good reason. - (cherry picked from commit aedbf1d63f94cee312b283503c8deb1ede1895a1) - -diff --git a/build/files.c b/build/files.c -index b4b893a..edba92a 100644 ---- a/build/files.c -+++ b/build/files.c -@@ -1394,8 +1394,8 @@ static rpmRC addFile(FileList fl, const char * diskPath, - } - } - -- if ((! fl->isDir) && S_ISDIR(statp->st_mode)) { --/* FIX: fl->buildRoot may be NULL */ -+ /* Don't recurse into explicit %dir, don't double-recurse from fts */ -+ if ((fl->isDir != 1) && (statp == &statbuf) && S_ISDIR(statp->st_mode)) { - return recurseDir(fl, diskPath); - } - -@@ -1529,8 +1529,6 @@ static rpmRC recurseDir(FileList fl, const char * diskPath) - int myFtsOpts = (FTS_COMFOLLOW | FTS_NOCHDIR | FTS_PHYSICAL); - rpmRC rc = RPMRC_FAIL; - -- fl->isDir = 1; /* Keep it from following myftw() again */ -- - ftsSet[0] = (char *) diskPath; - ftsSet[1] = NULL; - ftsp = Fts_open(ftsSet, myFtsOpts, NULL); -@@ -1563,8 +1561,6 @@ static rpmRC recurseDir(FileList fl, const char * diskPath) - } - (void) Fts_close(ftsp); - -- fl->isDir = 0; -- - return rc; - } - diff --git a/rpm.spec b/rpm.spec index 0864776..e8f3f2e 100644 --- a/rpm.spec +++ b/rpm.spec @@ -11,7 +11,7 @@ %define rpmhome /usr/lib/rpm -%define rpmver 4.9.1 +%define rpmver 4.9.1.1 %define srcver %{rpmver}%{?snapver:-%{snapver}} %define bdbname db4 @@ -21,7 +21,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}2%{?dist} +Release: %{?snapver:0.%{snapver}.}1%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2 @@ -40,7 +40,6 @@ Patch3: rpm-4.8.0-no-man-dirs.patch Patch4: rpm-4.8.1-use-gpg2.patch # Patches already in upstream -Patch200: rpm-4.9.1-recurse-dir.patch # These are not yet upstream Patch301: rpm-4.6.0-niagara.patch @@ -208,8 +207,6 @@ packages on a system. %patch3 -p1 -b .no-man-dirs %patch4 -p1 -b .use-gpg2 -%patch200 -p1 -b .recurse-dir - %patch301 -p1 -b .niagara %patch302 -p1 -b .geode %patch303 -p1 -b .debuginfo-allnames @@ -426,6 +423,9 @@ exit 0 %doc COPYING doc/librpm/html/* %changelog +* Tue Aug 02 2011 Panu Matilainen - 4.9.1.1-1 +- update to 4.9.1.1 + * Tue Jul 19 2011 Panu Matilainen - 4.9.1-2 - fix recursion of directories with trailing slash in file list (#722474) diff --git a/sources b/sources index 30b3261..2f7582a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -9fb2bf03c697d719a9bfc72aafb723b9 rpm-4.9.0.tar.bz2 -6d1eb8fbdb1cd11ab90420998c096a72 rpm-4.9.1.tar.bz2 +529df3e2705d851e26a9d88d5bd2ddd3 rpm-4.9.1.1.tar.bz2 From 4dd6dd15e611bac9d48893bdd9ed0cfb0e978818 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 8 Aug 2011 10:28:25 -0400 Subject: [PATCH 2/4] Add RPM_LD_FLAGS to build environment (#728974) --- rpm-4.9.1.1-ld-flags.patch | 15 +++++++++++++++ rpm.spec | 8 +++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 rpm-4.9.1.1-ld-flags.patch diff --git a/rpm-4.9.1.1-ld-flags.patch b/rpm-4.9.1.1-ld-flags.patch new file mode 100644 index 0000000..f8b2524 --- /dev/null +++ b/rpm-4.9.1.1-ld-flags.patch @@ -0,0 +1,15 @@ +diff -up rpm-4.9.1.1/macros.in.jx rpm-4.9.1.1/macros.in +--- rpm-4.9.1.1/macros.in.jx 2011-08-03 16:19:05.000000000 -0400 ++++ rpm-4.9.1.1/macros.in 2011-08-08 09:41:52.981064316 -0400 +@@ -674,9 +674,10 @@ print (t)\ + RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\ + RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\ + RPM_OPT_FLAGS=\"%{optflags}\"\ ++ RPM_LD_FLAGS=\"%{?__global_ldflags}\"\ + RPM_ARCH=\"%{_arch}\"\ + RPM_OS=\"%{_os}\"\ +- export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\ ++ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_LD_FLAGS RPM_ARCH RPM_OS\ + RPM_DOC_DIR=\"%{_docdir}\"\ + export RPM_DOC_DIR\ + RPM_PACKAGE_NAME=\"%{name}\"\ diff --git a/rpm.spec b/rpm.spec index e8f3f2e..0a9f39d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -21,7 +21,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}1%{?dist} +Release: %{?snapver:0.%{snapver}.}2%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2 @@ -46,6 +46,8 @@ Patch301: rpm-4.6.0-niagara.patch Patch302: rpm-4.7.1-geode-i686.patch # To be upstreamed after rawhide-testdrive (#641377) Patch303: rpm-4.9.0-debuginfo-allnames.patch +# Probably to be upstreamed in slightly different form +Patch304: rpm-4.9.1.1-ld-flags.patch # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD @@ -210,6 +212,7 @@ packages on a system. %patch301 -p1 -b .niagara %patch302 -p1 -b .geode %patch303 -p1 -b .debuginfo-allnames +%patch304 -p1 -b .ldflags %if %{with int_bdb} ln -s db-%{bdbver} db @@ -423,6 +426,9 @@ exit 0 %doc COPYING doc/librpm/html/* %changelog +* Mon Aug 08 2011 Adam Jackson 4.9.1.1-2 +- Add RPM_LD_FLAGS to build environment (#728974) + * Tue Aug 02 2011 Panu Matilainen - 4.9.1.1-1 - update to 4.9.1.1 From 7c0b68cbe5af3605641952be7f3aadfc329f2f74 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 9 Aug 2011 10:43:12 +0100 Subject: [PATCH 3/4] add arm conditional for gdb-add-index --- rpm.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rpm.spec b/rpm.spec index 0a9f39d..0a95a5a 100644 --- a/rpm.spec +++ b/rpm.spec @@ -155,7 +155,9 @@ Requires: elfutils >= 0.128 binutils Requires: findutils sed grep gawk diffutils file patch >= 2.5 Requires: unzip gzip bzip2 cpio xz Requires: pkgconfig >= 1:0.24 +%ifnarch %{arm} Requires: /usr/bin/gdb-add-index +%endif Conflicts: ocaml-runtime < 3.11.1-7 %description build @@ -426,6 +428,9 @@ exit 0 %doc COPYING doc/librpm/html/* %changelog +* Tue Aug 9 2011 Peter Robinson - 4.9.1.1-3 +- add arm conditional for gdb-add-index + * Mon Aug 08 2011 Adam Jackson 4.9.1.1-2 - Add RPM_LD_FLAGS to build environment (#728974) From a6258ccd0a83af5ec7228bba59135b1e50fae887 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 9 Aug 2011 10:47:19 +0100 Subject: [PATCH 4/4] drop last change as we have gdb on arm --- rpm.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rpm.spec b/rpm.spec index 0a95a5a..0a9f39d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -155,9 +155,7 @@ Requires: elfutils >= 0.128 binutils Requires: findutils sed grep gawk diffutils file patch >= 2.5 Requires: unzip gzip bzip2 cpio xz Requires: pkgconfig >= 1:0.24 -%ifnarch %{arm} Requires: /usr/bin/gdb-add-index -%endif Conflicts: ocaml-runtime < 3.11.1-7 %description build @@ -428,9 +426,6 @@ exit 0 %doc COPYING doc/librpm/html/* %changelog -* Tue Aug 9 2011 Peter Robinson - 4.9.1.1-3 -- add arm conditional for gdb-add-index - * Mon Aug 08 2011 Adam Jackson 4.9.1.1-2 - Add RPM_LD_FLAGS to build environment (#728974)