pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=74

Browse Source
This commit is contained in:
OBS User unknown 2009-02-16 16:11:16 +00:00 committed by Git OBS Bridge
parent d821deeaaa
commit 97d075bc9e
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debugsource-package.diff
View File

@ -40,9 +40,9 @@ Index: b/scripts/find-debuginfo.sh
$strict || strict_error=WARNING
-# Strip ELF binaries
-find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort |
-find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z |
+# Strip ELF binaries (and no static libraries)
+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort |
+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort -z |
xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' |
while read nlinks inum f; do
case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in

2
finddebuginfo.diff
View File

@ -45,7 +45,7 @@ Index: scripts/find-debuginfo.sh
- -print |
-file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' |
-xargs --no-run-if-empty stat -c '%h %D_%i %n' |
+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort |
+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) -print 0 | sort -z |
+xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' |
while read nlinks inum f; do
+ case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in

2
rpm-python.spec
View File

@ -24,7 +24,7 @@ License: GPL v2 or later
Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2.3
Release: 33
Release: 34
Requires: rpm = %{version}
%py_requires
Source99: rpm.spec

5
rpm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 16 17:10:31 CET 2009 - ro@suse.de
- fix sort call in finddebuginfo again
-------------------------------------------------------------------
Wed Feb 11 14:01:51 CET 2009 - coolo@suse.de

8
rpm.spec
View File

@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on
Summary: The RPM Package Manager
Version: 4.4.2.3
Release: 33
Release: 34
Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2
@ -332,7 +332,7 @@ Summary: A C library for parsing command line parameters
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
Release: 481
Release: 482
# bug437293
%ifarch ppc64
Obsoletes: popt-64bit
@ -360,7 +360,7 @@ Summary: C Library for Parsing Command Line Parameters
License: LGPL v2.1 or later
Group: System/Libraries
Version: 1.7
Release: 481
Release: 482
Requires: popt = 1.7
Requires: glibc-devel
# bug437293
@ -400,6 +400,8 @@ Authors:
%doc %{_mandir}/man3/popt.3*
%changelog
* Mon Feb 16 2009 ro@suse.de
- fix sort call in finddebuginfo again
* Wed Feb 11 2009 coolo@suse.de
- sort the result of find to make symlinks stable in finddebuginfo
* Wed Feb 11 2009 coolo@suse.de