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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 799bbbe..3257e0d 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,35 +1,30 @@
---- rpm-2.92/macros.in.old	Sun Mar 14 01:34:58 1999
-+++ rpm-2.92/macros.in	Sun Mar 28 17:18:20 1999
-@@ -38,19 +38,19 @@
- #	These are the default values that will be overridden by any
- #	explicit values found in /usr/lib/rpm/rpmrc or /etc/rpmrc.
- #
--%_builddir		%{_topdir}/BUILD
--%_bzip2bin		@BZIP2BIN@
--%_dbpath		%{_var}/lib/rpm
--%_defaultdocdir		/usr/doc
--%_fixperms		@FIXPERMS@
--%_gzipbin		@GZIPBIN@
--%_rpmdir		%{_topdir}/RPMS
--%_rpmfilename		%{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
--%_sourcedir		%{_topdir}/SOURCES
--%_specdir		%{_topdir}/SPECS
--%_srcrpmdir		%{_topdir}/SRPMS
--%_tmppath		%{_var}/tmp
+--- ./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
-+#%_builddir		%{_topdir}/BUILD
-+#%_bzip2bin		@BZIP2BIN@
-+#%_dbpath		%{_var}/lib/rpm
-+#%_defaultdocdir		/usr/doc
-+#%_fixperms		@FIXPERMS@
-+#%_gzipbin		@GZIPBIN@
-+#%_rpmdir		%{_topdir}/RPMS
-+#%_rpmfilename		%{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
-+#%_sourcedir		%{_topdir}/SOURCES
-+#%_specdir		%{_topdir}/SPECS
-+#%_srcrpmdir		%{_topdir}/SRPMS
-+#%_tmppath		%{_var}/tmp
-+#%_topdir		%{_usrsrc}/redhat
++%_topdir         %(echo $HOME)/rpm
+ 
+ #	The path to the unzip executable (legacy, use %{__unzip} instead).
+ %_unzipbin		%{__unzip}
+@@ -1276,5 +1276,18 @@
+ #
+ %find_lang	@RPMCONFIGDIR@/find-lang.sh %{buildroot}
  
- #==============================================================================
- # ---- per-platform macros.
++# 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
+ #*/