From: Jakub Bogusz Date: Thu, 24 May 2007 19:27:24 +0000 (+0000) Subject: - really use nil java dependency generators by default X-Git-Tag: auto/th/rpm-4_4_9-0_2~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=f8cb98bab991534c1f8b8e61b8e05bdd55380dfd;hp=769d887949774544fe4a2606119ad6d18cefc527 - really use nil java dependency generators by default Changed files: rpm-javadeps.patch -> 1.4 --- diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch index 4d70835..82a1fc8 100644 --- a/rpm-javadeps.patch +++ b/rpm-javadeps.patch @@ -13,15 +13,16 @@ } return 0; ---- rpm-4.4.9/macros.in.orig 2007-05-22 20:22:01.924940000 +0200 -+++ rpm-4.4.9/macros.in 2007-05-22 22:13:06.612739010 +0200 -@@ -444,6 +444,9 @@ - %__mono_provides %{nil} - %__mono_requires %{nil} - +--- rpm-4.4.9/macros.in.orig 2007-05-24 21:20:49.657284000 +0200 ++++ rpm-4.4.9/macros.in 2007-05-24 21:22:32.823163996 +0200 +@@ -1416,8 +1416,8 @@ + # + # Note: Used iff _use_internal_dependency_generator is non-zero. The + # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}. +-%__java_provides %{_usrlibrpm}/javadeps.sh --provides +-%__java_requires %{_usrlibrpm}/javadeps.sh --requires +%__java_provides %{nil} +%__java_requires %{nil} -+ - # - # Path to selinux file context patterns used to verify - # file contexts on file system. + + #------------------------------------------------------------------------ + # libtool(...) configuration.