]> git.pld-linux.org Git - packages/rpm.git/blob - rpm-javadeps.patch
- really use nil java dependency generators by default
[packages/rpm.git] / rpm-javadeps.patch
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
3 @@ -866,6 +866,12 @@
4         /* not only executable, files run by httpd usually are not */
5         if (fc->findreq)
6             xx = rpmfcHelper(fc, 'R', "php", fc->noautoreq, fc->noautoreq_c);
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      }
14  
15      return 0;
16 --- rpm-4.4.9/macros.in.orig    2007-05-24 21:20:49.657284000 +0200
17 +++ rpm-4.4.9/macros.in 2007-05-24 21:22:32.823163996 +0200
18 @@ -1416,8 +1416,8 @@
19  #
20  # Note: Used iff _use_internal_dependency_generator is non-zero. The
21  # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
22 -%__java_provides       %{_usrlibrpm}/javadeps.sh --provides
23 -%__java_requires       %{_usrlibrpm}/javadeps.sh --requires
24 +%__java_provides       %{nil}
25 +%__java_requires       %{nil}
26  
27  #------------------------------------------------------------------------
28  # libtool(...) configuration.
This page took 0.060393 seconds and 3 git commands to generate.