]>
Commit | Line | Data |
---|---|---|
54f5e944 ER |
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 | |
82b3aba0 AM |
3 | @@ -561,9 +561,10 @@ |
4 | ||
5 | # Horowitz Key Protocol server configuration | |
6 | # | |
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= | |
13 | ||
14 | ||
54f5e944 ER |
15 | @@ -670,18 +670,7 @@ |
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). | |
18 | # | |
19 | -%_dependency_whiteout_caos_core \ | |
20 | - perl>perl-Filter \ | |
21 | - pam>coreutils \ | |
22 | - pam>initscripts \ | |
23 | - glibc-common>glibc \ | |
24 | - glibc>nscd \ | |
25 | - filesystem>setup | |
26 | - | |
27 | -%_dependency_whiteout \ | |
28 | - %{?_dependency_whiteout_caos_core} \ | |
29 | - %{?_dependency_whiteout_system} \ | |
30 | - %{nil} | |
31 | +%_dependency_whiteout %{nil} | |
32 | ||
33 | # | |
34 | # Default path used for serializing transactions with a fcntl lock. |