X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=rpm-macros.patch;h=263deebe02d8a7d5e0478a5322385535647a8c8c;hb=7cf857f2dab39731c52fbe7a0e8a6277bdd07535;hp=00f289899be1e30aecd8c2a1c1b90260fb2cd241;hpb=7856cf5dbbc4883ef895047897b45c43c0bb9b5d;p=packages%2Frpm.git

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 00f2898..263deeb 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,61 +1,22 @@
-diff -ur rpm-3.0.1.old/configure.in rpm-3.0.1/configure.in
---- rpm-3.0.1.old/configure.in	Fri Jun  4 18:21:31 1999
-+++ rpm-3.0.1/configure.in	Fri Jun  4 18:22:00 1999
-@@ -781,7 +781,7 @@
- export LIBS INCPATH
- 
- AC_CONFIG_SUBDIRS(popt)
--AC_OUTPUT([Makefile rpmrc macros lib/Makefile
-+AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
- 	build/Makefile tools/Makefile scripts/Makefile
- 	tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
- 	misc/Makefile po/Makefile.in intl/Makefile],
-Only in rpm-3.0.1: configure.in~
-diff -ur rpm-3.0.1.old/macros.in rpm-3.0.1/macros.in
---- rpm-3.0.1.old/macros.in	Fri May 14 20:59:43 1999
-+++ rpm-3.0.1/macros.in	Fri Jun  4 18:28:25 1999
-@@ -60,12 +60,12 @@
- %_builddir		%{_topdir}/BUILD
- %_buildshell		/bin/sh
- %_bzip2bin		@BZIP2BIN@
--%_dbpath		%{_var}/lib/rpm
--%_defaultdocdir		%{_usr}/doc
-+%_dbpath		%{_var}/db/rpm
-+%_defaultdocdir		%{_usr}/share/doc
- #
- # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
--%_fixowner		[ `%{__id} -u` = '0' ] && %{__chown} -Rf root
--%_fixgroup		[ `%{__id} -u` = '0' ] && %{__chgrp} -Rf @ROOT_GROUP@
-+%_fixowner		[ `%{__id} -u` = '0' ] && %{__chown} -Rf root.@ROOT_GROUP@
-+#%_fixgroup		[ `%{__id} -u` = '0' ] && %{__chgrp} -Rf @ROOT_GROUP@
- %_fixperms		%{__chmod} -Rf @FIXPERMS@
- #
- %_gzipbin		@GZIPBIN@
-@@ -74,13 +74,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
- #
- #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -159,8 +159,8 @@
- %_libdir		%{_exec_prefix}/lib
- %_includedir		%{_prefix}/include
- %_oldincludedir		/usr/include
--%_infodir		%{_prefix}/include
--%_mandir		%{_prefix}/man
-+%_infodir		/usr/share/info
-+%_mandir		%{_prefix}/share/man
+-%_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}
  
- #==============================================================================
- # ---- config.guess platform macros.
-Only in rpm-3.0.1: macros.in~
+ #
+ # Default path used for serializing transactions with a  fcntl lock.