-diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
---- rpm-4.3.org/macros.in 2004-05-20 22:09:48.582353920 +0200
-+++ rpm-4.3/macros.in 2004-05-20 22:40:19.156064416 +0200
-@@ -118,15 +118,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,15 +195,21 @@
%debug_package \
%ifnarch noarch\
%global __debug_package 1\
-%package debug\
+%package debuginfo\
Summary: Debug information for package %{name}\
-+Summary(pl): Informacje dla debuggera dla pakietu %{name}\
++Summary(pl.UTF-8): Informacje dla debuggera dla pakietu %{name}\
Group: Development/Debug\
++Requires: filesystem-debuginfo >= 3.0-16\
AutoReqProv: 0\
-%description debug\
+%description debuginfo\
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.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\
%defattr(-,root,root)\
%endif\
%{nil}
-@@ -1247,7 +1252,12 @@
- unset DISPLAY ||:\
+@@ -1123,7 +1129,7 @@
+ %{?buildroot:%{__rm} -rf '%{buildroot}'}
+ %__spec_install_body %{___build_body}
+ %__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}
+--- 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
+ }
--%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
-+%install \
-+%if %{?_enable_debug_packages:1}%{!?_enable_debug_packages:0}\
-+%if %{_enable_debug_packages}\
-+%{?buildsubdir:%{debug_package}}\
-+%endif\
-+%endif\
- %%install\
- LANG=C\
- export LANG\
-@@ -1404,7 +1414,7 @@
- %{?verbose:set -x;} \
- if [ -d "$RPM_BUILD_ROOT" ]; then \
- echo "Strip executable binaries, archives and shared object files."; \
-- filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \
-+ filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \
- elfexelist=`echo $filelist | xargs -r file | \
- awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \
- elfsharedlist=`echo $filelist | xargs -r file | \
-diff -urN rpm-4.3.org/scripts/find-debuginfo.sh rpm-4.3/scripts/find-debuginfo.sh
---- rpm-4.3.org/scripts/find-debuginfo.sh 2004-05-20 22:09:25.767822256 +0200
-+++ rpm-4.3/scripts/find-debuginfo.sh 2004-05-20 23:12:43.367499352 +0200
-@@ -26,12 +26,14 @@
-
- mkdir -p "${debugdn}"
- 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"
- if test -w "$f"; then
-- eu-strip -f "${debugfn}" "$f" || :
-+ eu-strip -f "${debugfn}" -o "$f.tmp" "$f" || :
-+ rm -f "$f.tmp"
- else
- chmod u+w "$f"
-- eu-strip -f "${debugfn}" "$f" || :
-+ eu-strip -f "${debugfn}" -o "$f.tmp" "$f" || :
-+ rm -f "$f.tmp"
- chmod u-w "$f"
- fi
- done
+ # Make a relative symlink to $1 called $3$2
projects / packages / rpm.git / blobdiff