2007-06-15 Wade Berrier <wberrier@novell.com>

        * scripts/mono-find-requires.in: revert back to using package names
        for .config file dep scanning.  This is because noarch packages can be
        built on either 32 or 64 bit arches, depending on either a 32bit or 64bit
        library, which is wrong.

svn path=/trunk/mono/; revision=79803

diff --git a/ChangeLog b/ChangeLog
index d48078be222523fbef06c2b92cbb1657307c9a7e..c810ef07a7fb67f2922f4b86592aee0b87cffcf6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-15  Wade Berrier  <wberrier@novell.com>
+
+       * scripts/mono-find-requires.in: revert back to using package names
+       for .config file dep scanning.  This is because noarch packages can be
+       built on either 32 or 64 bit arches, depending on either a 32bit or 64bit
+       library, which is wrong.
 
 2007-06-13  Randolph Chung  <tausq@debian.org>
 

diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in
index df4f614f11ebdd91bab2bb29ef11d26824ca5047..63e3c03a6f37500f6b2ff97e2d57aebff687cbb4 100644 (file)
--- a/scripts/mono-find-requires.in
+++ b/scripts/mono-find-requires.in
@@ -103,7 +103,7 @@ REQUIRES=$(
                                }
                        }
                        if(!ignore) {
-                               print req"'$libext'"
+                               system("rpm -q --whatprovides --queryformat \"%{NAME}\n\" ""\""req"'$libext'""\"")
                        }
                } ' $i 2>/dev/null
        done
@@ -112,6 +112,8 @@ REQUIRES=$(
 # Note about above:
 #  Use to do: system("rpm -q --whatprovides --queryformat \"%{NAME}\n\" ""\""req"'$libext'""\"")
 #  rpmlint prefers to have lib names instead of package names.  There was a reason I was using package names but it slips me now...
+#  Ah... now I remember... it's for noarch packs.  The noarch packages can be built on either 32 or 64 bit... so we have to depend
+#   on the package name instead.
 
 PROVIDES=$(
        for i in "${monolist[@]}"; do