- space before debuginfocflags, kill syntax error (debuginfocflags not defined until...

[packages/rpm.git] / rpm-debuginfo.patch

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 9cdd6a5bbb62b505edaa8c61b80f15dd3178f6dd..bfb67956258f39eef3f7486cdc1dfe6dfd7e70e1 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,25 +1,83 @@
 diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
---- rpm-4.3.org/macros.in      2004-05-13 00:35:16.239893312 +0200
-+++ rpm-4.3/macros.in  2004-05-13 00:34:57.953673240 +0200
-@@ -118,7 +118,7 @@
+--- rpm-4.3.org/macros.in      2004-05-31 17:16:23.251095072 +0200
++++ rpm-4.3/macros.in  2004-05-31 17:35:47.653079064 +0200
+@@ -118,15 +118,20 @@
  %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}\
  Group: Development/Debug\
  AutoReqProv: 0\
-@@ -844,7 +844,11 @@
+-%description debug\
++%description debuginfo\
+ 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\
++Ten pakiet dostarcza informacje dla debuggera dla pakietu %{name}.\
++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}
+@@ -844,7 +849,11 @@
  %__spec_install_pre   %{___build_pre}
  %__spec_install_body  %{___build_body}
  %__spec_install_post\
--%{?__debug_package:%{__debug_install_post}}\
-+%if %{?__debug_package:1}%{!?__debug_package:0}\
-+%if %{__debug_package}\
-+%{__debug_install_post}\
++%if %{?_enable_debug_packages:1}%{!?_enable_debug_packages:0}\
++%if %{_enable_debug_packages}\
+ %{?__debug_package:%{__debug_install_post}}\
 +%endif\
 +%endif\
  %{__arch_install_post}\
  %{__os_install_post}\
  %{nil}
+@@ -1250,7 +1259,12 @@
+ unset DISPLAY ||:\
+ %{nil}
+ 
+-%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\
+@@ -1407,7 +1421,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-31 17:16:16.146175184 +0200
++++ rpm-4.3/scripts/find-debuginfo.sh  2004-05-31 17:16:51.153853208 +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