X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-macros.patch;h=4cb7be85c68fa527f51c9d09a9953dcdbe1f07ee;hb=289cde62c737f0a460fb87c718cef4a5852e4c60;hp=a07d1f286df347699eaecdb27b2ba80c76763aee;hpb=c4ea867f8777f7d05d27836c385b6702a888b766;p=packages%2Frpm.git

diff --git a/rpm-macros.patch b/rpm-macros.patch
index a07d1f2..4cb7be8 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,6 +1,7 @@
---- rpm-4.4.8/macros.in.orig	2007-04-08 20:24:47.206783474 +0200
-+++ rpm-4.4.8/macros.in	2007-04-08 20:36:08.925632417 +0200
-@@ -206,7 +206,7 @@
+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}
  
@@ -9,7 +10,7 @@
  
  #	The path to the pgp executable (legacy, use %{__pgp} instead).
  %_pgpbin		%{__pgp}
-@@ -233,12 +233,12 @@
+@@ -242,12 +242,12 @@
  #	The directory where newly built source packages will be written.
  %_srcrpmdir		%{_topdir}/SRPMS
  
@@ -20,12 +21,12 @@
  %tmpdir			%{_tmppath}
  
  #	Path to top of build area.
--%_topdir		%{_usrsrc}/rpm
+-%_topdir		@PKGSRCDIR_MACRO@
 +%_topdir		%(echo $HOME)/rpm
  
  #==============================================================================
  # ---- Optional rpmrc macros.
-@@ -248,7 +248,7 @@
+@@ -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).
  #
@@ -34,7 +35,7 @@
  
  #	The sub-directory (relative to %{_builddir}) where sources are compiled.
  #	This macro is set after processing %setup, either explicitly from the
-@@ -347,8 +347,8 @@
+@@ -356,8 +356,8 @@
  #		"w9.bzdio"	bzip2 level 9.
  #		"w9.lzdio"	lzma level 9.
  #
@@ -45,16 +46,7 @@
  
  #	Archive formats to use for source/binary package payloads.
  #		"cpio"		cpio archive (default)
-@@ -498,7 +498,7 @@
- 
- #
- # Path to magic file used for file classification.
--%_rpmfc_magic_path	%{_usr}/lib/rpm/magic
-+%_rpmfc_magic_path	/usr/share/file/magic
- 
- #==============================================================================
- # ---- Database configuration macros.
-@@ -1127,17 +1127,17 @@
+@@ -1224,17 +1224,17 @@
  %_exec_prefix		%{_prefix}
  %_bindir		%{_exec_prefix}/bin
  %_sbindir		%{_exec_prefix}/sbin
@@ -78,16 +70,19 @@
  %_localedir		%{_datadir}/locale
  
  #==============================================================================
-@@ -1428,7 +1428,25 @@
- # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
- #%__executable_provides	%{_usrlibrpm}/executabledeps.sh --provides
- #%__executable_requires	%{_usrlibrpm}/executabledeps.sh --requires
+@@ -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
 +
@@ -102,7 +97,11 @@
 +%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
  #*/
-