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

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

Browse Source
This commit is contained in:
OBS User unknown 2008-04-19 21:47:59 +00:00 committed by Git OBS Bridge
parent 405fac6301
commit 07ed9e7319
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
debugsource-package.diff
View File

@ -5,8 +5,8 @@ build the binary. The patches moves them into a separate package -debugsource.
--- ---
macros.in | 12 ++++++++++++ macros.in | 12 ++++++++++++
scripts/find-debuginfo.sh | 39 ++++++++++++++++++++++++--------------- scripts/find-debuginfo.sh | 43 ++++++++++++++++++++++++++-----------------
2 files changed, 36 insertions(+), 15 deletions(-) 2 files changed, 38 insertions(+), 17 deletions(-)
Index: b/macros.in Index: b/macros.in
=================================================================== ===================================================================
@ -35,7 +35,7 @@ Index: b/scripts/find-debuginfo.sh
=================================================================== ===================================================================
--- a/scripts/find-debuginfo.sh --- a/scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh +++ b/scripts/find-debuginfo.sh
@@ -7,11 +7,13 @@ else BUILDDIR=$1 @@ -7,14 +7,16 @@ else BUILDDIR=$1
fi fi
LISTFILE=$BUILDDIR/debugfiles.list LISTFILE=$BUILDDIR/debugfiles.list
@ -49,8 +49,13 @@ Index: b/scripts/find-debuginfo.sh
+[ -d "$TMPDIR" ] || TMPDIR="/tmp" +[ -d "$TMPDIR" ] || TMPDIR="/tmp"
+SOURCES_TMP=`mktemp $TMPDIR/rpmXXXXXX` +SOURCES_TMP=`mktemp $TMPDIR/rpmXXXXXX`
# Strip ELF binaries -# Strip ELF binaries
for f in `find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ` -for f in `find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) `
+# Strip ELF binaries (and never strip static libraries here)
+for f in `find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" `
do
case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
*debuglink*) continue ;;
@@ -36,7 +38,8 @@ do @@ -36,7 +38,8 @@ do
echo extracting debug info from $f echo extracting debug info from $f
mode=$(stat -c %a $f) mode=$(stat -c %a $f)
@ -69,7 +74,7 @@ Index: b/scripts/find-debuginfo.sh
+find ${debugdir} -type d -print0 | xargs -0 -r chmod 0755 +find ${debugdir} -type d -print0 | xargs -0 -r chmod 0755
+find ${debugdir} -type f -print0 | xargs -0 -r chmod 0644 +find ${debugdir} -type f -print0 | xargs -0 -r chmod 0644
+ +
+find ${debugdir} -mindepth 1 -maxdepth 1 | \ +find ${debugdir} -mindepth 1 -maxdepth 1 2>/dev/null | \
+ sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTFILE + sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTFILE
-mkdir -p ${RPM_BUILD_ROOT}/usr/src/debug -mkdir -p ${RPM_BUILD_ROOT}/usr/src/debug
@ -103,5 +108,5 @@ Index: b/scripts/find-debuginfo.sh
- find $RPM_BUILD_ROOT/$p -type f -print0 | xargs -0 -r chmod 0644 - find $RPM_BUILD_ROOT/$p -type f -print0 | xargs -0 -r chmod 0644
- find $RPM_BUILD_ROOT/$p -type d -print0 | xargs -0 -r chmod 0755 - find $RPM_BUILD_ROOT/$p -type d -print0 | xargs -0 -r chmod 0755
-done -done
+find ${debugsrcdir} -mindepth 1 -maxdepth 1 | \ +find ${debugsrcdir} -mindepth 1 -maxdepth 1 2>/dev/null | \
+ sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTSOURCE + sed -n -e "s#^$RPM_BUILD_ROOT##p" > $LISTSOURCE

2
rpm-python.spec
View File

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

6
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Apr 16 17:57:43 CEST 2008 - jblunck@suse.de
- Get rid of noise when no debuginfo was generated
- Never strip static libraries in find-debuginfo script
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 10 12:50:33 CEST 2008 - ro@suse.de Thu Apr 10 12:50:33 CEST 2008 - ro@suse.de

9
rpm.spec
View File

@ -21,7 +21,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on AutoReqProv: on
Summary: The RPM Package Manager Summary: The RPM Package Manager
Version: 4.4.2 Version: 4.4.2
Release: 187 Release: 189
Source: rpm-%{version}.tar.bz2 Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2 Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2 Source2: RPM-Tips.html.tar.bz2
@ -354,7 +354,7 @@ Summary: A C library for parsing command line parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 415 Release: 417
# #
%description -n popt %description -n popt
@ -377,7 +377,7 @@ Summary: C Library for Parsing Command Line Parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 415 Release: 417
Requires: popt = 1.7 Requires: popt = 1.7
Requires: glibc-devel Requires: glibc-devel
@ -412,6 +412,9 @@ Authors:
%doc %{_mandir}/man3/popt.3* %doc %{_mandir}/man3/popt.3*
%changelog %changelog
* Wed Apr 16 2008 jblunck@suse.de
- Get rid of noise when no debuginfo was generated
- Never strip static libraries in find-debuginfo script
* Thu Apr 10 2008 ro@suse.de * Thu Apr 10 2008 ro@suse.de
- added baselibs.conf file for xxbit packages - added baselibs.conf file for xxbit packages
* Thu Apr 10 2008 jw@suse.de * Thu Apr 10 2008 jw@suse.de