- updated to 5.0

Changed files:
    rpm-mono.patch -> 1.7

diff --git a/rpm-mono.patch b/rpm-mono.patch
index eb31d5fef06999f0a81fc3fc7cef2f0e2166f6bc..f4c6511bd93f1b7742d4f0c1cd4d82d6d2f31eff 100644 (file)
--- a/rpm-mono.patch
+++ b/rpm-mono.patch
@@ -1,79 +1,13 @@
---- rpm-4.4.8/lib/rpmfc.c.orig 2005-11-19 01:11:00.884392480 +0100
-+++ rpm-4.4.8/lib/rpmfc.c      2005-11-19 01:13:08.489993480 +0100
-@@ -539,6 +539,10 @@
- 
-   { "Java ",                  RPMFC_JAVA|RPMFC_INCLUDE },
- 
-+  /* .NET executables and libraries. file(1) cannot differ it from native win32 executables unfortunatelly */
-+  { "PE executable",          RPMFC_MONO|RPMFC_INCLUDE },
-+  { "executable PE",          RPMFC_MONO|RPMFC_INCLUDE },
-+
-   { "current ar archive",     RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
- 
-   { "Zip archive data",               RPMFC_COMPRESSED|RPMFC_ARCHIVE|RPMFC_INCLUDE },
-@@ -900,6 +904,35 @@
- }
- 
- /**
-+ * Extract .NET dependencies.
-+ * @param fc          file classifier
-+ * @return            0 on success
-+ */
-+static int rpmfcMONO(rpmfc fc)
-+      /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
-+      /*@modifies fc, rpmGlobalMacroContext, fileSystem, internalState @*/
-+{
-+    const char * fn = fc->fn[fc->ix];
-+    FILE * fp;
-+    int xx;
-+
-+    fp = fopen(fn, "r");
-+    if (fp == NULL || ferror(fp)) {
-+      if (fp) (void) fclose(fp);
-+      return -1;
-+    }
-+
-+    (void) fclose(fp);
-+
-+    if (fc->findprov)
-+      xx = rpmfcHelper(fc, 'P', "mono", fc->noautoprov, fc->noautoprov_c);
-+    if (fc->findreq)
-+      xx = rpmfcHelper(fc, 'R', "mono", fc->noautoreq, fc->noautoreq_c);
-+
-+    return 0;
-+}
-+
-+/**
-  * Extract Elf dependencies.
-  * @param fc          file classifier
-  * @return            0 on success
-@@ -931,6 +963,7 @@
- static struct rpmfcApplyTbl_s rpmfcApplyTable[] = {
-     { rpmfcELF,               RPMFC_ELF },
-     { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP) },
-+    { rpmfcMONO,      RPMFC_MONO },
-     { NULL, 0 }
- };
- 
---- rpm-4.4.8./lib/rpmfc.h     2005-08-11 13:11:54.000000000 +0200
-+++ rpm-4.4.8/lib/rpmfc.h      2005-08-11 14:10:33.000000000 +0200
-@@ -78,6 +78,7 @@
-     RPMFC_PYTHON              = (1 << 26),
-     RPMFC_PHP                 = (1 << 27),
-     RPMFC_TCL                 = (1 << 28),
-+    RPMFC_MONO                        = (1 <<  6),
- 
-     RPMFC_WHITE                       = (1 << 29),
-     RPMFC_INCLUDE             = (1 << 30),
---- rpm-4.4.9/macros.in.orig   2007-05-24 21:20:58.889811039 +0200
-+++ rpm-4.4.9/macros.in        2007-05-24 21:20:49.657284908 +0200
-@@ -1406,6 +1406,9 @@
- #%__php_provides              %{_usrlibrpm}/php.prov
- #%__php_requires              %{_usrlibrpm}/php.req
- 
+--- rpm-5.0.1/macros.in~       2008-01-31 00:06:10.000000000 +0200
++++ rpm-5.0.1/macros.in        2008-01-31 00:07:31.097681189 +0200
+@@ -1578,8 +1578,8 @@
+ #
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+-%__mono_provides      %{_rpmhome}/mono-find-provides
+-%__mono_requires      %{_rpmhome}/mono-find-requires
 +%__mono_provides      %{nil}
 +%__mono_requires      %{nil}
-+
+ 
  #------------------------------------------------------------------------
- # java(...) configuration.
- #
+ # executable(...) configuration.