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

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 996e4aa..263deeb 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,71 +1,22 @@
-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
- 
- 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
- #
- %__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@
- #
- %_gzipbin		@GZIPBIN@
-@@ -110,13 +110,13 @@
- %_rpmdir		%{_topdir}/RPMS
+--- 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).
  #
- # 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
+-%_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}
  
- #==============================================================================
- # ---- 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
-+%_localstatedir		/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
- 
- #==============================================================================
- # ---- config.guess platform macros.
+ #
+ # Default path used for serializing transactions with a  fcntl lock.