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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 4952063..e130885 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,21 +1,31 @@
-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 @@
+--- 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 @@
+ %endif\
+ %{nil}
+ 
+-%_defaultdocdir		%{_usr}/doc
++%_defaultdocdir		%{_usr}/share/doc
+ 
+ #	The path to the pgp executable (legacy, use %{__pgp} instead).
+ %_pgpbin		%{__pgp}
+@@ -233,12 +233,12 @@
+ #	The directory where newly built source packages will be written.
  %_srcrpmdir		%{_topdir}/SRPMS
  
- #	Directory where temporaray files can be created.
+-#	Directory where temporaray files can be created.
 -%_tmppath		%{_var}/tmp
++#	Directory where temporary files can be created.
 +%_tmppath		%(echo "${TMPDIR:-/tmp}")
-+%tmpdir			%{_tmppath}
+ %tmpdir			%{_tmppath}
  
  #	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 @@
+ #==============================================================================
+ # ---- Optional rpmrc macros.
+@@ -248,7 +248,7 @@
  #	Configurable build root path, same as BuildRoot: in a specfile.
  #	(Note: the configured macro value will override the spec file value).
  #
@@ -24,9 +34,9 @@ diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
  
  #	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).
+@@ -347,8 +347,8 @@
  #		"w9.bzdio"	bzip2 level 9.
+ #		"w9.lzdio"	lzma level 9.
  #
 -#%_source_payload	w9.gzdio
 -#%_binary_payload	w9.gzdio
@@ -35,7 +45,7 @@ diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
  
  #	Archive formats to use for source/binary package payloads.
  #		"cpio"		cpio archive (default)
-@@ -481,7 +482,7 @@
+@@ -498,7 +498,7 @@
  
  #
  # Path to magic file used for file classification.
@@ -44,22 +54,36 @@ diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
  
  #==============================================================================
  # ---- 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
+@@ -1127,17 +1127,17 @@
+ %_exec_prefix		%{_prefix}
+ %_bindir		%{_exec_prefix}/bin
+ %_sbindir		%{_exec_prefix}/sbin
+-%_libexecdir		%{_exec_prefix}/libexec
++%_libexecdir		%{_exec_prefix}/lib
+ %_datadir		%{_prefix}/share
+-%_sysconfdir		%{_prefix}/etc
+-%_sharedstatedir	%{_prefix}/com
+-%_localstatedir		%{_prefix}/var
++%_sysconfdir		/etc
++%_sharedstatedir	/var/lib
++%_localstatedir		/var
+ %_lib			lib
+ %_libdir		%{_exec_prefix}/%{_lib}
+ %_includedir		%{_prefix}/include
+ %_oldincludedir		/usr/include
+-%_infodir		%{_prefix}/info
+-%_mandir		%{_prefix}/man
++%_infodir		%{_prefix}/share/info
++%_mandir		%{_prefix}/share/man
+ %_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
+-%__scriptlet_requires	/bin/bash --rpm-requires
++#%__scriptlet_requires	/bin/bash --rpm-requires
  
 +# PLD rpm macros
 +%_enable_debug_packages 1
@@ -78,7 +102,17 @@ diff -ur rpm-4.4.7.org/macros.in rpm-4.4.7/macros.in
 +%rpmcflags	%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
 +%rpmcxxflags	%{rpmcflags}
 +%rpmldflags	%{!?no_build_with_as_needed:-Wl,--as-needed}
-+
++  
  # \endverbatim
  #*/
-
+--- rpm-4.4.8/configure.ac.orig	2007-04-08 20:24:47.210783702 +0200
++++ rpm-4.4.8/configure.ac	2007-04-08 20:32:18.216485052 +0200
+@@ -1462,7 +1462,7 @@
+ 	[Full path to rpm system configuration directory (usually /etc/rpm)])
+ AC_SUBST(SYSCONFIGDIR)
+ 
+-MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/.rpmmacros"
++MACROFILES="${USRLIBRPM}/macros:${USRLIBRPM}/macros.build:${USRLIBRPM}/%{_target}/macros:${SYSCONFIGDIR}/macros.*:${SYSCONFIGDIR}/macros:${SYSCONFIGDIR}/%{_target}/macros:~/etc/.rpmmacros:~/.rpmmacros"
+ AC_DEFINE_UNQUOTED(MACROFILES, "$MACROFILES",
+ 	[Colon separated paths of macro files to read.])
+ AC_SUBST(MACROFILES)