X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-macros.patch;h=495206302e777708b650870382acddfa9ae5a948;hb=5bfda13aa1aadc1300631a293e5a7e274b7613d9;hp=f3d54b59ef11dfc9a8fe393fc51c72cdb45a9674;hpb=3b934e94f3ed2b5008dfb3f71dcf0b6731893688;p=packages%2Frpm.git

diff --git a/rpm-macros.patch b/rpm-macros.patch
index f3d54b5..4952063 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,70 +1,84 @@
-diff -Nru rpm-4.0/configure.in rpm-4.0.new/configure.in
---- rpm-4.0/configure.in	Tue Aug 29 22:55:50 2000
-+++ rpm-4.0.new/configure.in	Wed Nov 15 19:15:17 2000
-@@ -951,7 +951,7 @@
- dnl export LIBS INCPATH CONFIG_SITE
+diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
+--- rpm-4.4.7.org/macros.in	2007-01-06 18:28:22.094067000 +0100
++++ rpm-4.4.7/macros.in	2007-01-06 18:37:05.250762500 +0100
+@@ -217,10 +217,11 @@
+ %_srcrpmdir		%{_topdir}/SRPMS
+ 
+ #	Directory where temporaray files can be created.
+-%_tmppath		%{_var}/tmp
++%_tmppath		%(echo "${TMPDIR:-/tmp}")
++%tmpdir			%{_tmppath}
  
- AC_CONFIG_SUBDIRS(popt)
--AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
-+AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt scripts/brp-redhat
- 	rpmio/Makefile lib/Makefile build/Makefile tools/Makefile
- 	scripts/Makefile
- 	tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
-diff -Nru rpm-4.0/macros.in rpm-4.0.new/macros.in
---- rpm-4.0/macros.in	Mon Aug 28 17:24:45 2000
-+++ rpm-4.0.new/macros.in	Wed Nov 15 19:12:09 2000
-@@ -88,7 +88,7 @@
- %_bzip2bin		@BZIP2BIN@
- %_dbpath		%{_var}/lib/rpm
- %_dbpath_rebuild	%{_dbpath}
--%_defaultdocdir		%{_usr}/doc
-+%_defaultdocdir		%{_usr}/share/doc
+ #	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}
+@@ -233,7 +234,7 @@
+ #	Configurable build root path, same as BuildRoot: in a specfile.
+ #	(Note: the configured macro value will override the spec file value).
  #
- %__find_provides	@FINDPROVIDES@
- %__find_requires	@FINDREQUIRES@
-@@ -100,8 +100,8 @@
- %__id_u			@__ID_U@
- %__chown_Rhf		@__CHOWN_RHF@
- %__chgrp_Rhf		@__CHGRP_RHF@
--%_fixowner		[ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
--%_fixgroup		[ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@
-+%_fixowner		[ `%{__id_u}` = '0' ] && %{__chown_Rhf} root.@ROOT_GROUP@
-+#%_fixgroup		[ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@
- %_fixperms		%{__chmod} -Rf @FIXPERMS@
+-%buildroot		%{_tmppath}/%{name}-root
++%buildroot		%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
+ 
+ #	The sub-directory (relative to %{_builddir}) where sources are compiled.
+ #	This macro is set after processing %setup, either explicitly from the
+@@ -331,8 +332,8 @@
+ #		"w9.gzdio"	gzip level 9 (default).
+ #		"w9.bzdio"	bzip2 level 9.
  #
- %_gzipbin		@GZIPBIN@
-@@ -110,13 +110,13 @@
- %_rpmdir		%{_topdir}/RPMS
+-#%_source_payload	w9.gzdio
+-#%_binary_payload	w9.gzdio
++%_source_payload	w9.gzdio
++%_binary_payload	w9.lzdio
+ 
+ #	Archive formats to use for source/binary package payloads.
+ #		"cpio"		cpio archive (default)
+@@ -481,7 +482,7 @@
+ 
  #
- # 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
- %_tmppath		%{_var}/tmp
--%_topdir		%{_usrsrc}/redhat
-+%_topdir		%(echo $HOME)/rpm
+ # Path to magic file used for file classification.
+-%_rpmfc_magic_path	%{_usr}/lib/rpm/magic
++%_rpmfc_magic_path	/usr/share/file/magic
  
  #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -455,15 +455,15 @@
- %_sbindir		%{_exec_prefix}/sbin
- %_libexecdir		%{_exec_prefix}/libexec
- %_datadir		%{_prefix}/share
--%_sysconfdir		%{_prefix}/etc
-+%_sysconfdir		/etc
- %_sharedstatedir	%{_prefix}/com
- %_localstatedir		%{_prefix}/var
- %_lib			lib
- %_libdir		%{_exec_prefix}/%{_lib}
- %_includedir		%{_prefix}/include
- %_oldincludedir		/usr/include
--%_infodir		%{_prefix}/info
--%_mandir		%{_prefix}/man
-+%_infodir		/usr/share/info
-+%_mandir		%{_prefix}/share/man
+ # ---- Database configuration macros.
+@@ -929,10 +930,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\
+@@ -1371,5 +1372,23 @@
+ #%__executable_requires	@RPMCONFIGDIR@/executabledeps.sh --requires
+ %__scriptlet_requires	/bin/bash --rpm-requires
  
- #==============================================================================
- # ---- config.guess 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: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
++# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
++
++%debugcflags	-O0 -g -Wall
++%optldflags	-Wl,--as-needed
++
++# Warning: those macros are overwritten by macros.build,
++#          left here for compatibility
++%rpmcflags	%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
++%rpmcxxflags	%{rpmcflags}
++%rpmldflags	%{!?no_build_with_as_needed:-Wl,--as-needed}
++
+ # \endverbatim
+ #*/
+