From 8bae88b146529d469742b33ead50b3a01457e313 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 24 Jul 2013 08:50:45 +0200
Subject: look for find-requires-gnome.sh in the right path

... and make sure it exists as well.

Change-Id: Ia895d93d2755a2b0b9d87601ace54ee47b5c1b80
---
 solenv/bin/modules/installer/epmfile.pm   | 2 +-
 solenv/bin/modules/installer/globals.pm   | 2 ++
 solenv/bin/modules/installer/parameter.pm | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'solenv/bin')

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 4ea85b68a375..c1dd768b797e 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1702,7 +1702,7 @@ sub prepare_packages
     if ( $installer::globals::isrpmbuild )
     {
         set_topdir_in_specfile($changefile, $filename, $newepmdir);
-        set_autoprovreq_in_specfile($changefile, $onepackage->{'findrequires'}, "$installer::globals::unpackpath" . "/bin");
+        set_autoprovreq_in_specfile($changefile, $onepackage->{'findrequires'}, "$installer::globals::workpath" . "/bin");
         set_packager_in_specfile($changefile);
         if ( is_extension_package($changefile) ) { set_prereq_in_specfile($changefile); }
         set_license_in_specfile($changefile, $variableshashref);
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index cb58cdc04b3a..2940407c0b81 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -59,6 +59,8 @@ BEGIN
     $ismacbuild = 0;
     $ismacdmgbuild = 0;
     $unpackpath = "";
+    $workpath = ""; # installation working dir; some helper scripts are
+    # placed here by gbuild
     $idttemplatepath = "";
     $idtlanguagepath = "";
     $buildid = "Not set";
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 4475ec47f788..0cc6e9e0c753 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -349,6 +349,11 @@ sub setglobalvariables
         $installer::globals::unpackpath = cwd();
     }
 
+    if ($installer::globals::workpath eq "")  # workpath not set
+    {
+        $installer::globals::workpath = cwd();
+    }
+
     if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; }
 
     if (!($installer::globals::unpackpath eq ""))
-- 
cgit