X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-macros.patch;h=f5705f9d83ffdd9a6e14b5328f21f842618d4507;hb=d6080f7091a3669538e0c5cd231c6605c3f14d82;hp=d03ae6083c0a457262e49a0e09525daa58b677c7;hpb=c96842a9520793d63b9aab8d0e792aea2b92387d;p=packages%2Frpm.git

diff --git a/rpm-macros.patch b/rpm-macros.patch
index d03ae60..f5705f9 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,41 +1,43 @@
-diff -Nur rpm-3.0.1/macros.in rpm-3.0.1.pld/macros.in
---- rpm-3.0.1/macros.in	Tue May 11 11:24:08 1999
-+++ rpm-3.0.1.pld/macros.in	Mon May 17 20:07:52 1999
-@@ -55,8 +55,8 @@
- %_builddir		%{_topdir}/BUILD
- %_buildshell		/bin/sh
- %_bzip2bin		@BZIP2BIN@
--%_dbpath		%{_var}/lib/rpm
--%_defaultdocdir		%{_usr}/doc
-+%_dbpath		%{_var}/db/rpm
-+%_defaultdocdir		%{_usr}/share/doc
- #
- # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
- %_fixowner		[ `%{__id} -u` = '0' ] && %{__chown} -Rf root
-@@ -69,13 +69,13 @@
- %_rpmdir		%{_topdir}/RPMS
- #
- # XXX Note escaped %% for use in headerSprintf
--%_rpmfilename		%%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-+%_rpmfilename		%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
- %_signature		none
- %_sourcedir		%{_topdir}/SOURCES
- %_specdir		%{_topdir}/SPECS
- %_srcrpmdir		%{_topdir}/SRPMS
+--- 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
--%_topdir		%{_usrsrc}/redhat
+ 
+ #	Path to top of build area.
+-%_topdir		%{_usrsrc}/rpm
 +%_topdir		%(echo $HOME)/rpm
- #
- #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -154,8 +154,8 @@
- %_libdir		%{_exec_prefix}/lib
- %_includedir		%{_prefix}/include
- %_oldincludedir		/usr/include
--%_infodir		%{_prefix}/include
--%_mandir		%{_prefix}/man
-+%_infodir		/usr/share/info
-+%_mandir		%{_prefix}/share/man
  
- #==============================================================================
- # ---- config.guess platform macros.
+ #	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
+ #*/