X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-macros.patch;h=3257e0de96074ca7b6a8d92ff130c7a4c0bb6a58;hb=14bbe7694804a79c6699a2fcc1ea264fafe6ddc7;hp=be59aa530751265c78582a0b3f7246cefdd40e7a;hpb=67505e093d14df7b74126f7c518091cc956e7d10;p=packages%2Frpm.git

diff --git a/rpm-macros.patch b/rpm-macros.patch
index be59aa5..3257e0d 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,20 +1,30 @@
---- rpm-4.0.2/macros.in.wiget	Mon Dec 11 19:40:56 2000
-+++ rpm-4.0.2/macros.in	Fri Aug 10 12:20:45 2001
-@@ -476,17 +476,14 @@
- #	Macro(s) similar to the tokens used by configure.
+--- ./macros.in~	2005-10-30 16:24:30.000000000 +0200
++++ ./macros.in	2005-10-30 16:24:32.000000000 +0200
+@@ -223,7 +223,7 @@
+ %_tmppath		%{_var}/tmp
+ 
+ #	Path to top of build area.
+-%_topdir		%{_usrsrc}/redhat
++%_topdir         %(echo $HOME)/rpm
+ 
+ #	The path to the unzip executable (legacy, use %{__unzip} instead).
+ %_unzipbin		%{__unzip}
+@@ -1276,5 +1276,18 @@
  #
- %_build			%{_host}
--%_build_alias		%{_host_alias}
- %_build_cpu		%{_host_cpu}
- %_build_vendor		%{_host_vendor}
- %_build_os		%{_host_os}
- %_host			@host@
--%_host_alias		@host_alias@
- %_host_cpu		@host_cpu@
- %_host_vendor		@host_vendor@
- %_host_os		@host_os@
- %_target		%{_host}
--%_target_alias		%{_host_alias}
- %_target_cpu		%{_host_cpu}
- %_target_vendor		%{_host_vendor}
- %_target_os		%{_host_os}
+ %find_lang	@RPMCONFIGDIR@/find-lang.sh %{buildroot}
+ 
++# PLD rpm macros
++%_enable_debug_packages 1
++
++#-----------------------------------------------------------------
++# CFLAGS and LDFLAGS used to build
++
++%debuginfocflags	%{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
++
++%debugcflags	-O0 -g -Wall
++%rpmcflags	%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
++%rpmcxxflags	%{rpmcflags}
++%rpmldflags	%{nil}
++
+ # \endverbatim
+ #*/