---- rpm-3.0.4/configure.in.wiget Wed Mar 15 13:29:09 2000
-+++ rpm-3.0.4/configure.in Wed Mar 22 17:30:33 2000
-@@ -932,7 +932,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
- 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
---- rpm-3.0.4/macros.in.wiget Thu Mar 9 19:13:03 2000
-+++ rpm-3.0.4/macros.in Wed Mar 22 17:33:43 2000
-@@ -80,9 +80,9 @@
- %_builddir %{_topdir}/BUILD
- %_buildshell /bin/sh
- %_bzip2bin @BZIP2BIN@
--%_dbpath %{_var}/lib/rpm
-+%_dbpath %{_var}/state/rpm
- %_rebuilddbpath %{_dbpath}
--%_defaultdocdir %{_usr}/doc
-+%_defaultdocdir %{_usr}/share/doc
- #
- %__find_provides @FINDPROVIDES@
- %__find_requires @FINDREQUIRES@
-@@ -94,8 +94,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@
-@@ -104,13 +104,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.
-@@ -384,14 +384,14 @@
- %_sbindir %{_exec_prefix}/sbin
- %_libexecdir %{_exec_prefix}/libexec
- %_datadir %{_prefix}/share
--%_sysconfdir %{_prefix}/etc
-+%_sysconfdir /etc
- %_sharedstatedir %{_prefix}/com
- %_localstatedir %{_prefix}/var
- %_libdir %{_exec_prefix}/lib
- %_includedir %{_prefix}/include
- %_oldincludedir /usr/include
--%_infodir %{_prefix}/info
--%_mandir %{_prefix}/man
-+%_infodir %{_prefix}/share/info
-+%_mandir %{_prefix}/share/man
-
- #==============================================================================
- # ---- config.guess platform macros.
+ #
+ # Default path used for serializing transactions with a fcntl lock.