Author: arekm Date: Tue Oct 2 18:43:38 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
rpm-debuginfo.patch (1.15 -> 1.16)
---- Diffs:
================================================================
Index: SOURCES/rpm-debuginfo.patch
diff -u SOURCES/rpm-debuginfo.patch:1.15 SOURCES/rpm-debuginfo.patch:1.16
--- SOURCES/rpm-debuginfo.patch:1.15 Sat Sep 2 20:09:38 2006
+++ SOURCES/rpm-debuginfo.patch Tue Oct 2 20:43:33 2007
@@ -1,7 +1,7 @@
-diff -ur rpm-4.4.6.org/macros.in rpm-4.4.6/macros.in
---- rpm-4.4.6.org/macros.in 2006-04-08 21:04:54.000000000 +0200
-+++ rpm-4.4.6/macros.in 2006-06-30 22:03:15.076727750 +0200
-@@ -168,15 +168,20 @@
+diff -ur rpm.org/macros.in rpm/macros.in
+--- rpm.org/macros.in 2007-10-02 20:31:56.905775000 +0200
++++ rpm/macros.in 2007-10-02 20:35:30.122401828 +0200
+@@ -195,14 +195,19 @@
%debug_package \
%ifnarch noarch\
%global __debug_package 1\
@@ -16,17 +16,15 @@
This package provides debug information for package %{name}.\
Debug information is useful when developing applications that use this\
package or when debugging this package.\
--%files debug -f debugfiles.list\
-+%description debuginfo -l pl\
++%description debuginfo -l pl_PL.UTF-8\
+Ten pakiet dostarcza informacje dla debuggera dla pakietu %{name}.\
-+Informacje te s� przydatne przy rozwijaniu aplikacji u�ywaj�cych tego\
++Informacje te są przydatne przy rozwijaniu aplikacji używających tego\
+pakietu oraz przy odpluskwianiu samego pakietu.\
-+%files debuginfo -f debugfiles.list\
+ %files debug -f debugfiles.list\
%defattr(-,root,root)\
%endif\
- %{nil}
-@@ -961,7 +966,7 @@
- %__spec_install_pre %{___build_pre}
+@@ -1123,7 +1128,7 @@
+ %{?buildroot:%{__rm} -rf '%{buildroot}'}
%__spec_install_body %{___build_body}
%__spec_install_post\
-%{?__debug_package:%{__debug_install_post}}\
@@ -34,43 +32,16 @@
%{__arch_install_post}\
%{__os_install_post}\
%{nil}
-diff -ur rpm-4.4.6.org/platform.in rpm-4.4.6/platform.in
---- rpm-4.4.6.org/platform.in 2006-06-30 22:01:46.743207000 +0200
-+++ rpm-4.4.6/platform.in 2006-06-30 22:03:15.080728000 +0200
-@@ -61,7 +61,7 @@
- %{nil}
-
- %__spec_install_post\
-- %{?__debug_package:%{__debug_install_post}}\
-+ %{expand:%%define __sip_%{?_enable_debug_packages}
1}%{?__sip_1:%{?__debug_package:%{__debug_install_post}}}%{expand:%%undefine
__sip_%{?_enable_debug_packages}}\
- %{__arch_install_post}\
- %{__os_install_post}\
- %{nil}
-diff -ur rpm-4.4.6.org/scripts/find-debuginfo.sh
rpm-4.4.6/scripts/find-debuginfo.sh
---- rpm-4.4.6.org/scripts/find-debuginfo.sh 2006-02-12 15:59:51.000000000
+0100
-+++ rpm-4.4.6/scripts/find-debuginfo.sh 2006-06-30 22:03:53.451126000
+0200
-@@ -15,7 +15,8 @@
-
- strip_to_debug()
- {
-- eu-strip --remove-comment -f "$1" "$2" || :
-+ objcopy --only-keep-debug --remove-section .comment "$2" "$1"
-+ objcopy --add-gnu-debuglink="$1" "$2"
+diff -ur rpm.org/scripts/find-debuginfo.sh rpm/scripts/find-debuginfo.sh
+--- rpm.org/scripts/find-debuginfo.sh 2007-09-06 09:36:38.000000000 +0200
++++ rpm/scripts/find-debuginfo.sh 2007-10-02 20:38:57.745519759 +0200
+@@ -92,7 +92,8 @@
+ $strip_g && case "$(file -bi "$2")" in
+ application/x-sharedlib,*) g=-g ;;
+ esac
+- eu-strip --remove-comment $g -f "$1" "$2" || exit
++ objcopy --only-keep-debug --remove-section .comment "$2" "$1" || exit
++ objcopy --add-gnu-debuglink="$1" "$2" || exit
}
- # Strip ELF binaries
-@@ -30,7 +31,7 @@
- [ -f "${debugfn}" ] && continue
-
- echo extracting debug info from $f
-- /usr/lib/rpm/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l
"$SOURCEFILE" "$f"
-+ /usr/bin/debugedit -b "$RPM_BUILD_DIR" -d /usr/src/debug -l
"$SOURCEFILE" "$f"
-
- # A binary already copied into /usr/lib/debug doesn't get stripped,
- # just has its file names collected and adjusted.
-@@ -54,4 +55,5 @@
- find ${RPM_BUILD_ROOT}/usr/src/debug -type d -print0 | xargs -0 chmod a+rx
-
- find ${RPM_BUILD_ROOT}/usr/lib/debug -type f | sed -n -e
"s#^$RPM_BUILD_ROOT##p" > $LISTFILE
-+find ${RPM_BUILD_ROOT}/usr/lib/debug -mindepth 1 -type d | sed -n -e
"s#^$RPM_BUILD_ROOT#%dir #p" >> $LISTFILE
- find ${RPM_BUILD_ROOT}/usr/src/debug -mindepth 1 -maxdepth 1 | sed -n -e
"s#^$RPM_BUILD_ROOT##p" >> $LISTFILE
+ # Make a relative symlink to $1 called $3$2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-debuginfo.patch?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
