- arch macros

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

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index a08ef0e4eb479185d8cf1a8fb9c49266a9968af7..aec5afd5e7347fa14be051bfa382b02433375c99 100644 (file)
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,25 +1,47 @@
---- rpm-4.3/macros.in.alreadey_patched 2004-05-31 16:47:32.496632272 +0200
-+++ rpm-4.3/macros.in  2004-05-31 16:46:14.976417136 +0200
-@@ -107,12 +107,16 @@
- #     The location of the rpm database file(s) after "rpm --rebuilddb".
- %_dbpath_rebuild      %{_dbpath}
- 
--#
--#     Path to script that creates debug symbols in a /usr/lib/debug
--#     shadow tree.
--%__debug_install_post   \
--   @RPMCONFIGDIR@/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
--%{nil}
-+#------------------------------------------------------------------
-+# Path to script that creates debug symbols in a /usr/lib/debug
-+# shadow tree.
-+#%no_debug_install_post 1
-+%__debug_install_post { \
-+%{!?no_debug_install_post: \
-+      /usr/lib/rpm/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
-+      %{nil}\
-+} }
-+#------------------------------------------------------------------
- 
- #     Template for debug information sub-package.
+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\
+-%package debug\
++%package debuginfo\
+ Summary: Debug information for package %{name}\
++Summary(pl): Informacje dla debuggera dla pakietu %{name}\
+ Group: Development/Debug\
+ AutoReqProv: 0\
+-%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.\
++%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\
++pakietu oraz przy odpluskwianiu samego pakietu.\
+ %files debug -f debugfiles.list\
+ %defattr(-,root,root)\
+ %endif\
+@@ -1123,7 +1128,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}
+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
+ }
+ 
+ # Make a relative symlink to $1 called $3$2