]>
Commit | Line | Data |
---|---|---|
2f610562 JB |
1 | --- rpm-4.4.9/lib/rpmfc.c.orig 2007-05-22 20:19:05.990914000 +0200 |
2 | +++ rpm-4.4.9/lib/rpmfc.c 2007-05-22 22:12:38.775152636 +0200 | |
fee89ffa AM |
3 | @@ -875,7 +875,14 @@ |
4 | if (is_executable) | |
5 | if (fc->findreq) | |
6 | xx = rpmfcHelper(fc, 'R', "mono", fc->noautoreq, fc->noautoreq_c); | |
2f610562 JB |
7 | + } else |
8 | + if (fc->fcolor->vals[fc->ix] & RPMFC_JAVA) { | |
9 | + if (fc->findprov) | |
10 | + xx = rpmfcHelper(fc, 'P', "java", fc->noautoprov, fc->noautoprov_c); | |
11 | + if (fc->findreq) | |
12 | + xx = rpmfcHelper(fc, 'R', "java", fc->noautoreq, fc->noautoreq_c); | |
13 | } | |
fee89ffa | 14 | + |
2f610562 | 15 | return 0; |
fee89ffa AM |
16 | } |
17 | ||
f8cb98ba JB |
18 | --- rpm-4.4.9/macros.in.orig 2007-05-24 21:20:49.657284000 +0200 |
19 | +++ rpm-4.4.9/macros.in 2007-05-24 21:22:32.823163996 +0200 | |
20 | @@ -1416,8 +1416,8 @@ | |
21 | # | |
22 | # Note: Used iff _use_internal_dependency_generator is non-zero. The | |
fee89ffa AM |
23 | # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. |
24 | -%__java_provides %{_rpmhome}/javadeps.sh --provides | |
25 | -%__java_requires %{_rpmhome}/javadeps.sh --requires | |
2f610562 JB |
26 | +%__java_provides %{nil} |
27 | +%__java_requires %{nil} | |
f8cb98ba JB |
28 | |
29 | #------------------------------------------------------------------------ | |
30 | # libtool(...) configuration. |