testing/rpm
SHA256
6
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

- update to rpm-4.10.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=213
This commit is contained in:
Michael Schröder
2012-08-28 13:31:44 +00:00
committed by Git OBS Bridge
parent 2995f03e34
commit ff04a9b972
42 changed files with 814 additions and 2391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
brp.diff
View File

@@ -1,26 +1,36 @@
--- scripts/brp-strip
+++ scripts/brp-strip
@@ -15,6 +15,7 @@
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" | \
grep -v ' shared object,' | \
+ grep -v '/lib/modules/' | \
sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do
$STRIP -g "$f" || :
done
--- scripts/brp-strip-comment-note
+++ scripts/brp-strip-comment-note
@@ -16,6 +16,8 @@
--- ./scripts/Makefile.am.orig 2012-03-20 08:07:25.000000000 +0000
+++ ./scripts/Makefile.am 2012-06-01 11:39:13.000000000 +0000
@@ -25,6 +25,7 @@ EXTRA_DIST = \
rpmconfig_SCRIPTS = \
brp-compress brp-python-bytecompile brp-java-gcjcompile \
brp-strip brp-strip-comment-note brp-python-hardlink \
+ brp-suse \
brp-strip-shared brp-strip-static-archive \
check-files check-prereqs \
check-buildroot check-rpaths check-rpaths-worker \
--- ./scripts/brp-strip-comment-note.orig 2012-03-20 08:07:25.000000000 +0000
+++ ./scripts/brp-strip-comment-note 2012-06-01 11:39:13.000000000 +0000
@@ -16,6 +16,8 @@ esac
# 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" | \
+ grep -v ' shared object,' | \
+ grep -v '/lib/modules/' | \
sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do
note="-R .note"
if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \
--- scripts/brp-suse
+++ scripts/brp-suse
--- ./scripts/brp-strip.orig 2012-03-20 08:07:25.000000000 +0000
+++ ./scripts/brp-strip 2012-06-01 11:39:13.000000000 +0000
@@ -15,6 +15,7 @@ esac
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" | \
grep -v ' shared object,' | \
+ grep -v '/lib/modules/' | \
sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do
$STRIP -g "$f" || :
done
--- ./scripts/brp-suse.orig 2012-06-01 11:39:13.000000000 +0000
+++ ./scripts/brp-suse 2012-06-01 11:39:13.000000000 +0000
@@ -0,0 +1,13 @@
+#! /bin/sh
+
@@ -35,13 +45,3 @@
+ $script || exit 1
+ fi
+done
--- scripts/Makefile.am
+++ scripts/Makefile.am
@@ -25,6 +25,7 @@
rpmconfig_SCRIPTS = \
brp-compress brp-python-bytecompile brp-java-gcjcompile \
brp-strip brp-strip-comment-note brp-python-hardlink \
+ brp-suse \
brp-strip-shared brp-strip-static-archive \
check-files check-prereqs \
check-buildroot check-rpaths check-rpaths-worker \