backport --nopretrans, --noposttrans options

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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index bfb67956258f39eef3f7486cdc1dfe6dfd7e70e1..537f8bcf4cc426f4227f65486be5185c23063a63 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,15 +1,15 @@
-diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
---- 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 @@
+--- rpm-4.4.9.orig/macros.in   2008-01-31 19:20:08.798315963 +0200
++++ rpm-4.4.9/macros.in        2008-01-31 19:20:50.850567944 +0200
+@@ -188,15 +188,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\
@@ -17,67 +17,31 @@ diff -urN rpm-4.3.org/macros.in rpm-4.3/macros.in
  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}
-@@ -844,7 +849,11 @@
- %__spec_install_pre   %{___build_pre}
+@@ -1046,7 +1052,7 @@
+ %{?buildroot:%{__rm} -rf '%{buildroot}'}
  %__spec_install_body  %{___build_body}
  %__spec_install_post\
-+%if %{?_enable_debug_packages:1}%{!?_enable_debug_packages:0}\
-+%if %{_enable_debug_packages}\
- %{?__debug_package:%{__debug_install_post}}\
-+%endif\
-+%endif\
+-%{?__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}
-@@ -1250,7 +1259,12 @@
- unset DISPLAY ||:\
+--- rpm-4.4.9.orig/platform.in 2008-01-31 19:20:08.676303626 +0200
++++ rpm-4.4.9/platform.in      2008-01-31 19:20:50.844567337 +0200
+@@ -61,7 +61,7 @@
  %{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
+ %__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}