backport --nopretrans, --noposttrans options

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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 656536370ef2976414196e3dfd186a64e6e5753f..537f8bcf4cc426f4227f65486be5185c23063a63 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,15 +1,15 @@
-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 @@
+--- 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,16 +17,16 @@ diff -ur rpm-4.4.6.org/macros.in rpm-4.4.6/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}
-@@ -961,7 +966,7 @@
- %__spec_install_pre   %{___build_pre}
+@@ -1046,7 +1052,7 @@
+ %{?buildroot:%{__rm} -rf '%{buildroot}'}
  %__spec_install_body  %{___build_body}
  %__spec_install_post\
 -%{?__debug_package:%{__debug_install_post}}\
@@ -34,9 +34,8 @@ diff -ur rpm-4.4.6.org/macros.in rpm-4.4.6/macros.in
  %{__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
+--- 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}
  
@@ -46,31 +45,3 @@ diff -ur rpm-4.4.6.org/platform.in rpm-4.4.6/platform.in
      %{__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" || :
-+  eu-strip --remove-comment -f "$1" -o "${2}.tmp" "$2" || :
-+  rm -f "${2}.tmp"
- }
- 
- # 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