X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-macros.patch;h=263deebe02d8a7d5e0478a5322385535647a8c8c;hb=d2b7930e425e7c3b352e94988132914bff715984;hp=2f96d3077116a0e384b76c8478f6f64eedf21624;hpb=e72fb97a4c2d6d31f05ff8695b45f381b4d8ec19;p=packages%2Frpm.git

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 2f96d30..263deeb 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,70 +1,22 @@
-diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
---- rpm-4.4.6.orig/macros.in	2006-08-05 20:52:48.000000000 +0200
-+++ rpm-4.4.6.macros/macros.in	2006-08-05 20:53:57.000000000 +0200
-@@ -219,7 +219,7 @@
- %_tmppath		%{_var}/tmp
- 
- #	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}
-@@ -330,8 +330,8 @@
- #		"w9.gzdio"	gzip level 9 (default).
- #		"w9.bzdio"	bzip2 level 9.
+--- rpm-5.4.10/macros/macros.in~	2012-11-17 00:38:23.000000000 +0200
++++ rpm-5.4.10/macros/macros.in	2012-11-17 00:38:55.871401871 +0200
+@@ -670,18 +670,7 @@
+ # XXX	Note: that there cannot be any whitespace within the string "p>q",
+ #	and that both p and q are package names (i.e. no version/release).
  #
--#%_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 +481,7 @@
+-%_dependency_whiteout_caos_core		\
+-	perl>perl-Filter		\
+-	pam>coreutils			\
+-	pam>initscripts			\
+-	glibc-common>glibc		\
+-	glibc>nscd			\
+-	filesystem>setup
+-
+-%_dependency_whiteout			\
+-	%{?_dependency_whiteout_caos_core} \
+-	%{?_dependency_whiteout_system} \
+-	%{nil}
++%_dependency_whiteout	%{nil}
  
  #
- # 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.
-@@ -909,10 +909,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\
-@@ -1350,5 +1350,23 @@
- #%__executable_provides	@RPMCONFIGDIR@/executabledeps.sh --provides
- #%__executable_requires	@RPMCONFIGDIR@/executabledeps.sh --requires
- 
-+# 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
- #*/
-
+ # Default path used for serializing transactions with a  fcntl lock.