]>
Commit | Line | Data |
---|---|---|
26ea8a78 JR |
1 | --- rpm-5.4.10/lib/depends.c~ 2012-04-15 23:20:56.000000000 +0200 |
2 | +++ rpm-5.4.10/lib/depends.c 2012-09-03 23:00:59.363079731 +0200 | |
3 | @@ -1569,7 +1569,7 @@ | |
a3809792 JR |
4 | int terminate = 2; /* XXX terminate if rc >= terminate */ |
5 | int rc; | |
6 | int ourrc = 0; | |
26ea8a78 JR |
7 | -#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ |
8 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_PLD) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ | |
9 | int dirname_deps; | |
10 | int symlink_deps; | |
11 | #endif | |
12 | @@ -1648,7 +1648,7 @@ | |
a3809792 JR |
13 | } |
14 | } | |
15 | ||
26ea8a78 JR |
16 | -#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ |
17 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_PLD) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ | |
18 | dirname_deps = rpmExpandNumeric("%{?_check_dirname_deps}%{?!_check_dirname_deps:1}"); | |
19 | if (dirname_deps) { | |
20 | #endif | |
21 | @@ -1692,7 +1692,7 @@ | |
a3809792 JR |
22 | /*@switchbreak@*/ break; |
23 | } | |
24 | } | |
26ea8a78 JR |
25 | -#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ |
26 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_PLD) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ | |
27 | } | |
a3809792 | 28 | |
26ea8a78 JR |
29 | symlink_deps = rpmExpandNumeric("%{?_check_symlink_deps}%{?!_check_symlink_deps:1}"); |
30 | @@ -1740,7 +1740,7 @@ | |
31 | /*@switchbreak@*/ break; | |
32 | } | |
33 | } | |
34 | -#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ | |
35 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) || defined(RPM_VENDOR_PLD) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /* optional-dirname-and-symlink-deps */ | |
36 | } | |
37 | #endif | |
a3809792 | 38 |