RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Matthew Dawkins
Root: /v/rpm/cvs Email: mdawk...@rpm5.org
Module: rpm Date: 08-May-2012 05:00:44
Branch: rpm-5_4 Handle: 2012050803004301
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/scripts brp-strip-comment-note brp-strip-shared
find-debuginfo.sh
Log:
applied mdv patch
rpm-5.4.4-fix-scripts-breaking-when-RPM_BUILD_ROOT-contains-spaces.patch
Submitted by: mdawkins
Summary:
Revision Changes Path
1.3501.2.281+2 -0 rpm/CHANGES
1.5.10.1 +1 -1 rpm/scripts/brp-strip-comment-note
1.4.10.1 +1 -1 rpm/scripts/brp-strip-shared
1.14.2.6 +1 -1 rpm/scripts/find-debuginfo.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.280 -r1.3501.2.281 CHANGES
--- rpm/CHANGES 8 May 2012 00:44:03 -0000 1.3501.2.280
+++ rpm/CHANGES 8 May 2012 03:00:43 -0000 1.3501.2.281
@@ -1,4 +1,5 @@
5.4.8 -> 5.4.9:
+ - mdawkins: applied mdv patch
rpm-5.4.4-fix-scripts-breaking-when-RPM_BUILD_ROOT-contains-spaces.patch
- mdawkins: applied mdv patch
rpm-5.4.5-enable-internal-dependency-generator.patch
- mdawkins: applied mdv patch rpm-5.4.4-fix-_sys_macros_dir-path.patch
- mdawkins: applied mdv patch
rpm-5.4.4-merge-rpm-mandriva-setup-build-macros.patch
@@ -21,6 +22,7 @@
- debugedit: swipe latest frpm @rpm.org and the ELF cabal.
- mdawkins: applied mdv patch
rpm-5.4.4-find-debuginfo-drop-useless-sort.patch
- mdawkins: added python typelib G-IR support to pythonegg.py (gmoro mdv)
+ - mdawkins: applied mdv patch
rpm-5.4.5-fix-pythonegg-deps-for-egg-metadata-in-directories.patch
- mdawkins: dropped vendor if defs for no-owner-group-on-srpm-install
- mdawkins: added js file extention detection for typelib G-IR
- devzero2000: drop @rpm.org brp-python-hardlink
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/brp-strip-comment-note
============================================================================
$ cvs diff -u -r1.5 -r1.5.10.1 brp-strip-comment-note
--- rpm/scripts/brp-strip-comment-note 20 Jun 2007 16:56:47 -0000
1.5
+++ rpm/scripts/brp-strip-comment-note 8 May 2012 03:00:44 -0000
1.5.10.1
@@ -16,7 +16,7 @@
# Strip .comment and .note sections (the latter only if it is not allocated)
# for already stripped elf files in the build root
-for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or
-perm -0001 \) -exec file {} \; | \
+for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or
-perm -0001 \) -exec file {} \; | \
grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \
sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do
note="-R .note"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/brp-strip-shared
============================================================================
$ cvs diff -u -r1.4 -r1.4.10.1 brp-strip-shared
--- rpm/scripts/brp-strip-shared 20 Jun 2007 16:56:47 -0000 1.4
+++ rpm/scripts/brp-strip-shared 8 May 2012 03:00:44 -0000 1.4.10.1
@@ -18,7 +18,7 @@
# Strip ELF shared objects
# Please note we don't restrict our search to executable files because
# our libraries are not (should not be, at least) +x.
-for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \
+for f in `find "$RPM_BUILD_ROOT" -type f -a -exec file {} \; | \
grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \
grep ' shared object,' | \
sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/find-debuginfo.sh
============================================================================
$ cvs diff -u -r1.14.2.5 -r1.14.2.6 find-debuginfo.sh
--- rpm/scripts/find-debuginfo.sh 7 May 2012 23:28:05 -0000 1.14.2.5
+++ rpm/scripts/find-debuginfo.sh 8 May 2012 03:00:44 -0000 1.14.2.6
@@ -243,7 +243,7 @@
# For each symlink whose target has a .debug file,
# make a .debug symlink to that file.
-find $RPM_BUILD_ROOT ! -path "${debugdir}/*" -type l -print | LANG=C sort |
+find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*" -type l -print | LANG=C sort |
while read f
do
t=$(readlink -m "$f").debug
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
