- fix merge

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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index be59aa530751265c78582a0b3f7246cefdd40e7a..f5705f9d83ffdd9a6e14b5328f21f842618d4507 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,20 +1,43 @@
---- 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.
- #
- %_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}
+--- rpm-4.4.3/macros.in.orig   2005-11-19 01:18:44.483914640 +0100
++++ rpm-4.4.3/macros.in        2005-11-19 01:19:50.657854672 +0100
+@@ -219,7 +219,7 @@
+ %_tmppath             %{_var}/tmp
+ 
+ #     Path to top of build area.
+-%_topdir              %{_usrsrc}/rpm
++%_topdir              %(echo $HOME)/rpm
+ 
+ #     The path to the unzip executable (legacy, use %{__unzip} instead).
+ %_unzipbin            %{__unzip}
+@@ -932,10 +932,10 @@
+   export RPM_BUILD_ROOT}\
+   %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
+   export CLASSPATH}\
+-  unset PERL_MM_OPT\
++  unset PERL_MM_OPT || :\
+   LANG=C\
+   export LANG\
+-  unset DISPLAY\
++  unset DISPLAY || :\
+   \
+   %{verbose:set -x}%{!verbose:exec > /dev/null}\
+   umask 022\
+@@ -1373,5 +1373,18 @@
+ #%__executable_provides       @RPMCONFIGDIR@/executabledeps.sh --provides
+ #%__executable_requires       @RPMCONFIGDIR@/executabledeps.sh --requires
+ 
++# 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
+ #*/