- updated

Changed files:
    rpm-javadeps.patch -> 1.5
    rpm-macros.patch -> 1.43

diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch
index 82a1fc868ae130c56641fd1a9e9c8d9e3bdb14d6..833db5db8ccbf0513983a6dc270ffab362083f42 100644 (file)
--- a/rpm-javadeps.patch
+++ b/rpm-javadeps.patch
@@ -1,9 +1,9 @@
 --- rpm-4.4.9/lib/rpmfc.c.orig 2007-05-22 20:19:05.990914000 +0200
 +++ rpm-4.4.9/lib/rpmfc.c      2007-05-22 22:12:38.775152636 +0200
-@@ -866,6 +866,12 @@
-       /* not only executable, files run by httpd usually are not */
-       if (fc->findreq)
-           xx = rpmfcHelper(fc, 'R', "php", fc->noautoreq, fc->noautoreq_c);
+@@ -875,7 +875,14 @@
+       if (is_executable)
+           if (fc->findreq)
+           xx = rpmfcHelper(fc, 'R', "mono", fc->noautoreq, fc->noautoreq_c);
 +    } else
 +    if (fc->fcolor->vals[fc->ix] & RPMFC_JAVA) {
 +      if (fc->findprov)
@@ -11,16 +11,18 @@
 +      if (fc->findreq)
 +          xx = rpmfcHelper(fc, 'R', "java", fc->noautoreq, fc->noautoreq_c);
      }
- 
++
      return 0;
+ }
+ 
 --- 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
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+-%__java_provides      %{_rpmhome}/javadeps.sh --provides
+-%__java_requires      %{_rpmhome}/javadeps.sh --requires
 +%__java_provides      %{nil}
 +%__java_requires      %{nil}
  

diff --git a/rpm-macros.patch b/rpm-macros.patch
index a07d1f286df347699eaecdb27b2ba80c76763aee..1f1048143d53ead06d0fb061ce986fe6a20c6312 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -20,7 +20,7 @@
  %tmpdir                       %{_tmppath}
  
  #     Path to top of build area.
--%_topdir              %{_usrsrc}/rpm
+-%_topdir              @PKGSRCDIR_MACRO@
 +%_topdir              %(echo $HOME)/rpm
  
  #==============================================================================
@@ -49,7 +49,7 @@
  
  #
  # Path to magic file used for file classification.
--%_rpmfc_magic_path    %{_usr}/lib/rpm/magic
+-%_rpmfc_magic_path    %{_rpmhome}/magic
 +%_rpmfc_magic_path    /usr/share/file/magic
  
  #==============================================================================
@@ -79,9 +79,9 @@
  
  #==============================================================================
 @@ -1428,7 +1428,25 @@
- # helpers are also used by %{_usrlibrpm}/rpmdeps {--provides|--requires}.
- #%__executable_provides       %{_usrlibrpm}/executabledeps.sh --provides
- #%__executable_requires       %{_usrlibrpm}/executabledeps.sh --requires
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ #%__executable_provides       %{_rpmhome}/executabledeps.sh --provides
+ #%__executable_requires       %{_rpmhome}/executabledeps.sh --requires
 -%__scriptlet_requires /bin/bash --rpm-requires
 +#%__scriptlet_requires        /bin/bash --rpm-requires