1 --- rpm-5.4.10/macros/macros.in~ 2012-11-17 00:38:23.000000000 +0200
2 +++ rpm-5.4.10/macros/macros.in 2012-11-17 00:38:55.871401871 +0200
5 # Horowitz Key Protocol server configuration
7 -%_hkp_keyserver hkp://keys.rpm5.org
8 +#%_hkp_keyserver hkp://keys.rpm5.org
9 #%_hkp_keyserver hkp://keys.n3npq.net
10 #%_hkp_keyserver hkp://pool.sks-keyservers.net
11 +%_hkp_keyserver hkp://ha.pool.sks-keyservers.net
12 %_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=
16 # XXX Note: that there cannot be any whitespace within the string "p>q",
17 # and that both p and q are package names (i.e. no version/release).
19 -%_dependency_whiteout_caos_core \
23 - glibc-common>glibc \
27 -%_dependency_whiteout \
28 - %{?_dependency_whiteout_caos_core} \
29 - %{?_dependency_whiteout_system} \
31 +%_dependency_whiteout %{nil}
34 # Default path used for serializing transactions with a fcntl lock.