Merge branch 'master' into f16
This commit is contained in:
commit
839293f509
|
@ -3,3 +3,4 @@ rpm-4.8.1.tar.bz2
|
||||||
/rpm-4.9.0-rc1.tar.bz2
|
/rpm-4.9.0-rc1.tar.bz2
|
||||||
/rpm-4.9.0.tar.bz2
|
/rpm-4.9.0.tar.bz2
|
||||||
/rpm-4.9.1.tar.bz2
|
/rpm-4.9.1.tar.bz2
|
||||||
|
/rpm-4.9.1.1.tar.bz2
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
commit 27c56c58209ee7c890f34429e030bfdb39105084
|
|
||||||
Author: Panu Matilainen <pmatilai@redhat.com>
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
|
@ -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}\"\
|
14
rpm.spec
14
rpm.spec
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
%define rpmhome /usr/lib/rpm
|
%define rpmhome /usr/lib/rpm
|
||||||
|
|
||||||
%define rpmver 4.9.1
|
%define rpmver 4.9.1.1
|
||||||
%define srcver %{rpmver}%{?snapver:-%{snapver}}
|
%define srcver %{rpmver}%{?snapver:-%{snapver}}
|
||||||
|
|
||||||
%define bdbname db4
|
%define bdbname db4
|
||||||
|
@ -40,13 +40,14 @@ Patch3: rpm-4.8.0-no-man-dirs.patch
|
||||||
Patch4: rpm-4.8.1-use-gpg2.patch
|
Patch4: rpm-4.8.1-use-gpg2.patch
|
||||||
|
|
||||||
# Patches already in upstream
|
# Patches already in upstream
|
||||||
Patch200: rpm-4.9.1-recurse-dir.patch
|
|
||||||
|
|
||||||
# These are not yet upstream
|
# These are not yet upstream
|
||||||
Patch301: rpm-4.6.0-niagara.patch
|
Patch301: rpm-4.6.0-niagara.patch
|
||||||
Patch302: rpm-4.7.1-geode-i686.patch
|
Patch302: rpm-4.7.1-geode-i686.patch
|
||||||
# To be upstreamed after rawhide-testdrive (#641377)
|
# To be upstreamed after rawhide-testdrive (#641377)
|
||||||
Patch303: rpm-4.9.0-debuginfo-allnames.patch
|
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
|
# Partially GPL/LGPL dual-licensed and some bits with BSD
|
||||||
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
|
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
|
||||||
|
@ -208,11 +209,10 @@ packages on a system.
|
||||||
%patch3 -p1 -b .no-man-dirs
|
%patch3 -p1 -b .no-man-dirs
|
||||||
%patch4 -p1 -b .use-gpg2
|
%patch4 -p1 -b .use-gpg2
|
||||||
|
|
||||||
%patch200 -p1 -b .recurse-dir
|
|
||||||
|
|
||||||
%patch301 -p1 -b .niagara
|
%patch301 -p1 -b .niagara
|
||||||
%patch302 -p1 -b .geode
|
%patch302 -p1 -b .geode
|
||||||
%patch303 -p1 -b .debuginfo-allnames
|
%patch303 -p1 -b .debuginfo-allnames
|
||||||
|
%patch304 -p1 -b .ldflags
|
||||||
|
|
||||||
%if %{with int_bdb}
|
%if %{with int_bdb}
|
||||||
ln -s db-%{bdbver} db
|
ln -s db-%{bdbver} db
|
||||||
|
@ -426,6 +426,12 @@ exit 0
|
||||||
%doc COPYING doc/librpm/html/*
|
%doc COPYING doc/librpm/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 08 2011 Adam Jackson <ajax@redhat.com> 4.9.1.1-2
|
||||||
|
- Add RPM_LD_FLAGS to build environment (#728974)
|
||||||
|
|
||||||
|
* Tue Aug 02 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.1-1
|
||||||
|
- update to 4.9.1.1
|
||||||
|
|
||||||
* Tue Jul 19 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.1-2
|
* Tue Jul 19 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.1-2
|
||||||
- fix recursion of directories with trailing slash in file list (#722474)
|
- fix recursion of directories with trailing slash in file list (#722474)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue