| 538a3775 |
1 | --- rpm-4.4.2/macros.in~ 2005-12-25 03:50:21.000000000 +0200 |
| 2 | +++ rpm-4.4.2/macros.in 2006-01-08 17:17:24.000000000 +0200 |
| 3 | @@ -776,78 +776,7 @@ |
| 4 | # XXX Note: that there cannot be any whitespace within the string "p>q", |
| 5 | # and that both p and q are package names (i.e. no version/release). |
| 6 | # |
| 7 | -#%_dependency_whiteout_5_2 \ |
| 8 | -# pam>pamconfig |
| 9 | -#%_dependency_whiteout_6_1 \ |
| 10 | -# pilot-link-devel>pilot-link |
| 11 | -#%_dependency_whiteout_6_2 \ |
| 12 | -# egcs-c++>libstdc++ |
| 13 | -%_dependency_whiteout_7_0 \ |
| 14 | - pango-gtkbeta-devel>pango-gtkbeta\ |
| 15 | - XFree86>Mesa \ |
| 16 | - compat-glibc>db2 \ |
| 17 | - compat-glibc>db1 \ |
| 18 | - pam>initscripts \ |
| 19 | - initscripts>sysklogd |
| 20 | -%_dependency_whiteout_7_1 \ |
| 21 | - arts>kdelibs-sound |
| 22 | -%_dependency_whiteout_7_2 \ |
| 23 | - libgnomeprint15>gnome-print \ |
| 24 | - nautilus>nautilus-mozilla \ |
| 25 | - tcl>postgresql-tcl |
| 26 | -#%_dependency_whiteout_8_0 \ |
| 27 | -# perl>perl-Parse-RecDescent \ |
| 28 | -# XFree86-libs>XFree86-Mesa-libGL \ |
| 29 | -# perl>perl-Filter \ |
| 30 | -# perl>mrtg \ |
| 31 | -# perl>mod_perl \ |
| 32 | -# mysql>perl-DBD-MySQL \ |
| 33 | -# ghostscript>gimp-print \ |
| 34 | -# arts>kde2-compat \ |
| 35 | -# perl-Date-Calc>perl-Bit-Vector \ |
| 36 | -# glibc-debug>glibc-devel |
| 37 | - |
| 38 | -%_dependency_whiteout_8_0 \ |
| 39 | - mysql>perl-DBD-MySQL \ |
| 40 | - perl>perl-Filter \ |
| 41 | - perl>mrtg \ |
| 42 | - perl>mod_perl \ |
| 43 | - perl-Date-Calc>perl-Bit-Vector \ |
| 44 | - |
| 45 | -%_dependency_whiteout_fc3 \ |
| 46 | - coreutils>pam \ |
| 47 | - nautilus>nautilus-cd-burner \ |
| 48 | - aspell>aspell-en \ |
| 49 | - kernel>initscripts \ |
| 50 | - kernel-smp>initscripts \ |
| 51 | - xorg-x11-libs>xorg-x11-Mesa-libGL \ |
| 52 | - openldap>cyrus-sasl-md5 \ |
| 53 | - openldap>cyrus-sasl \ |
| 54 | - openjade>docbook-dtds \ |
| 55 | - gtk+>gdk-pixbuf \ |
| 56 | - xorg-x11>xinitrc \ |
| 57 | - gnome-python2>gnome-python2-bonobo \ |
| 58 | - httpd-suexec>httpd \ |
| 59 | - xemacs-sumo>apel-xemacs \ |
| 60 | - php>php-pear \ |
| 61 | - openoffice.org-libs>openoffice.org |
| 62 | - |
| 63 | %_dependency_whiteout \ |
| 64 | - libtermcap>bash \ |
| 65 | - modutils>vixie-cron \ |
| 66 | - ypbind>yp-tools \ |
| 67 | - ghostscript-fonts>ghostscript \ |
| 68 | - %{?_dependency_whiteout_fc3} \ |
| 69 | - %{?_dependency_whiteout_fc2} \ |
| 70 | - %{?_dependency_whiteout_fc1} \ |
| 71 | - %{?_dependency_whiteout_9} \ |
| 72 | - %{?_dependency_whiteout_8_0} \ |
| 73 | - %{?_dependency_whiteout_7_2} \ |
| 74 | - %{?_dependency_whiteout_7_1} \ |
| 75 | - %{?_dependency_whiteout_7_0} \ |
| 76 | - %{?_dependency_whiteout_6_2} \ |
| 77 | - %{?_dependency_whiteout_6_1} \ |
| 78 | - %{?_dependency_whiteout_5_2} \ |
| 79 | %{nil} |
| 80 | |
| 81 | # |
projects / packages / rpm.git / blame