X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-macros.patch;h=4cb7be85c68fa527f51c9d09a9953dcdbe1f07ee;hb=e7daca0ab8b27950992c66d7d7e8985c8eb0a236;hp=562a13a0389239067a055b448cec0764084a78a3;hpb=1e537e49c952f46a4b65000ab50e1e8bba32be3f;p=packages%2Frpm.git

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 562a13a..4cb7be8 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,62 +1,63 @@
-diff -Nru rpm-4.0.1/configure.in rpm-4.0.1.new/configure.in
---- rpm-4.0.1/configure.in	Wed Jan 31 13:22:16 2001
-+++ rpm-4.0.1.new/configure.in	Wed Jan 31 13:23:24 2001
-@@ -1042,7 +1042,7 @@
- dnl export LIBS INCPATH CONFIG_SITE
+diff -urN rpm.org/macros.in rpm/macros.in
+--- rpm.org/macros.in	2007-10-02 20:46:56.430390000 +0200
++++ rpm/macros.in	2007-10-02 20:49:01.480941544 +0200
+@@ -213,7 +213,7 @@
+ %endif\
+ %{nil}
  
- AC_CONFIG_SUBDIRS(popt)
--AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/brp-redhat
-+AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt rpm.spec 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.1/macros.in rpm-4.0.1.new/macros.in
---- rpm-4.0.1/macros.in	Wed Jan 31 13:22:16 2001
-+++ rpm-4.0.1.new/macros.in	Wed Jan 31 13:24:31 2001
-@@ -90,7 +90,7 @@
- %_bzip2bin		@BZIP2BIN@
- %_dbpath		%{_var}/lib/rpm
- %_dbpath_rebuild	%{_dbpath}
 -%_defaultdocdir		%{_usr}/doc
 +%_defaultdocdir		%{_usr}/share/doc
- #
- %__find_provides	@FINDPROVIDES@
- %__find_requires	@FINDREQUIRES@
-@@ -102,8 +102,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@
- #
- %_gzipbin		@GZIPBIN@
-@@ -112,13 +112,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
+ 
+ #	The path to the pgp executable (legacy, use %{__pgp} instead).
+ %_pgpbin		%{__pgp}
+@@ -242,12 +242,12 @@
+ #	The directory where newly built source packages will be written.
  %_srcrpmdir		%{_topdir}/SRPMS
- %_tmppath		%{_var}/tmp
--%_topdir		%{_usrsrc}/redhat
+ 
+-#	Directory where temporaray files can be created.
+-%_tmppath		%{_var}/tmp
++#	Directory where temporary files can be created.
++%_tmppath		%(echo "${TMPDIR:-/tmp}")
+ %tmpdir			%{_tmppath}
+ 
+ #	Path to top of build area.
+-%_topdir		@PKGSRCDIR_MACRO@
 +%_topdir		%(echo $HOME)/rpm
- %_unzipbin		@UNZIPBIN@
  
  #==============================================================================
-@@ -461,15 +461,15 @@
+ # ---- Optional rpmrc macros.
+@@ -257,7 +257,7 @@
+ #	Configurable build root path, same as BuildRoot: in a specfile.
+ #	(Note: the configured macro value will override the spec file value).
+ #
+-%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
+@@ -356,8 +356,8 @@
+ #		"w9.bzdio"	bzip2 level 9.
+ #		"w9.lzdio"	lzma level 9.
+ #
+-#%_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)
+@@ -1224,17 +1224,17 @@
+ %_exec_prefix		%{_prefix}
+ %_bindir		%{_exec_prefix}/bin
  %_sbindir		%{_exec_prefix}/sbin
- %_libexecdir		%{_exec_prefix}/libexec
+-%_libexecdir		%{_exec_prefix}/libexec
++%_libexecdir		%{_exec_prefix}/lib
  %_datadir		%{_prefix}/share
 -%_sysconfdir		%{_prefix}/etc
-+%_sysconfdir		/etc
- %_sharedstatedir	%{_prefix}/com
+-%_sharedstatedir	%{_prefix}/com
 -%_localstatedir		%{_prefix}/var
++%_sysconfdir		/etc
++%_sharedstatedir	/var/lib
 +%_localstatedir		/var
  %_lib			lib
  %_libdir		%{_exec_prefix}/%{_lib}
@@ -64,8 +65,43 @@ diff -Nru rpm-4.0.1/macros.in rpm-4.0.1.new/macros.in
  %_oldincludedir		/usr/include
 -%_infodir		%{_prefix}/info
 -%_mandir		%{_prefix}/man
-+%_infodir		/usr/share/info
++%_infodir		%{_prefix}/share/info
 +%_mandir		%{_prefix}/share/man
+ %_localedir		%{_datadir}/locale
  
  #==============================================================================
- # ---- config.guess platform macros.
+@@ -1535,7 +1535,33 @@
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ #%__executable_provides	%{_rpmhome}/executabledeps.sh --provides
+ #%__executable_requires	%{_rpmhome}/executabledeps.sh --requires
+-%__scriptlet_requires	/bin/bash --rpm-requires
++#%__scriptlet_requires	/bin/bash --rpm-requires
+ 
++# PLD rpm macros
++%_enable_debug_packages 1
++
++# provides don't obsolete
++%_upgrade_tag name
++
++#-----------------------------------------------------------------
++# 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}
++
++# arch macros
++%ix86	i386 i486 i586 i686 pentium3 pentium4 athlon
++%x8664	x86_64 amd64 ia32e
++%ppc	ppc ppc7400 ppc7450
++  
+ # \endverbatim
+ #*/