[Libreoffice-commits] .: 2 commits - setup_native/scripts solenv/bin

[Michael Stahl]

 setup_native/scripts/fake-db.spec       |    3 +++
 solenv/bin/modules/installer/epmfile.pm |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a21546ea4d86eab38c5abf1b27dff20929a2ce12
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Nov 8 12:55:37 2011 +0100

    installer: fix RPM requires:
    
    The findrequires scripts are apparently ignored by current RPM.
    Apparently an additional variable needs to be defined so they are used.
    
    http://www.redhat.com/archives/rpm-list/2005-August/msg00034.html

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 682967e..049ae8a 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1424,7 +1424,7 @@ sub set_autoprovreq_in_specfile
 
     if ( $findrequires )
     {
-        $autoreqprovline = "AutoProv\: no\n%define __find_requires $bindir/$findrequires\n";
+        $autoreqprovline = "AutoProv\: no\n%define _use_internal_dependency_generator 0\n%define __find_requires $bindir/$findrequires\n";
     }
     else
     {
commit 7a080d0f46c9c53480a5c6876bb110ae8a657879
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Nov 8 12:54:46 2011 +0100

    setup_native: add 64 bit provides to fake-db.rpm

diff --git a/setup_native/scripts/fake-db.spec b/setup_native/scripts/fake-db.spec
index e627504..f2d2b52 100644
--- a/setup_native/scripts/fake-db.spec
+++ b/setup_native/scripts/fake-db.spec
@@ -9,8 +9,11 @@ AutoReqProv: no
 %define _tmppath /tmp
 #BuildRoot: %{_tmppath}/%{name}-root
 Provides: libgnomevfs-2.so.0
+Provides: libgnomevfs-2.so.0()(64bit)
 Provides: libgconf-2.so.4
+Provides: libgconf-2.so.4()(64bit)
 Provides: libfreetype.so.6
+Provides: libfreetype.so.6()(64bit)
 Provides: /bin/sh
 Provides: /bin/basename
 Provides: /bin/cat