---- rpm-2.93/macros.in.macros Thu Apr 8 17:51:13 1999
-+++ rpm-2.93/macros.in Thu Apr 8 18:02:34 1999
-@@ -66,13 +66,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
+@@ -561,9 +561,10 @@
+
+ # Horowitz Key Protocol server configuration
#
- # 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
+-%_hkp_keyserver hkp://keys.rpm5.org
++#%_hkp_keyserver hkp://keys.rpm5.org
+ #%_hkp_keyserver hkp://keys.n3npq.net
+ #%_hkp_keyserver hkp://pool.sks-keyservers.net
++%_hkp_keyserver hkp://ha.pool.sks-keyservers.net
+ %_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=
+
+
+@@ -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).
#
- #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -96,7 +96,7 @@
- #%_pgp_path
- #%_provides
- #%_timecheck
--#%vendor
-+%vendor PLD
+-%_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}
- #==============================================================================
- # ---- per-platform macros.
+ #
+ # Default path used for serializing transactions with a fcntl lock.