[lpf/f19] Patch for bz #1057878 added.

[leamas]

commit 28be0fd6d60a19bb18ef834a192bc6ea52f34ff4
Author: Alec Leamas <leamas.alec at gmail.com>
Date:   Mon Jan 27 19:10:04 2014 +0100

    Patch for bz #1057878 added.

 ...pkgbuild-Bugfix-respect-CONFIG-bz-1057878.patch |   59 ++++++++++++++++++++
 lpf.spec                                           |    7 ++-
 2 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/0003-pkgbuild-Bugfix-respect-CONFIG-bz-1057878.patch b/0003-pkgbuild-Bugfix-respect-CONFIG-bz-1057878.patch
new file mode 100644
index 0000000..5ba484c
--- /dev/null
+++ b/0003-pkgbuild-Bugfix-respect-CONFIG-bz-1057878.patch
@@ -0,0 +1,59 @@
+From 6549a7abbd84791261b40f66726eb027a45df59b Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Mon, 27 Jan 2014 18:55:34 +0100
+Subject: [PATCH 3/3] pkgbuild: Bugfix: respect CONFIG (bz 1057878).
+
+---
+ TESTING               | 2 ++
+ scripts/lpf-defs.bash | 1 +
+ scripts/lpf-pkgbuild  | 3 +++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/TESTING b/TESTING
+index 740e82b..cce98e8 100644
+--- a/TESTING
++++ b/TESTING
+@@ -38,6 +38,8 @@ There are some automated tests and some manual. To run them all:
+ 
+ - Check that repeated GUI update displays correct "Nothing to update" message.
+ 
++- Rebuild lpf-skype on a 64-bit host.
++
+ Running in mock:
+     $ mock -r fedora-19-i386  --init
+     $ mock -r fedora-19-i386  --install ~/dist/lpf-*.noarch.rpm
+diff --git a/scripts/lpf-defs.bash b/scripts/lpf-defs.bash
+index b53b1ca..c838d2e 100644
+--- a/scripts/lpf-defs.bash
++++ b/scripts/lpf-defs.bash
+@@ -23,6 +23,7 @@ function get_approve_file() { echo $LPF_VAR/approvals/$1; }
+ function get_resultdir()    { echo $LPF_VAR/rpms/$1; }
+ function get_notifydir()    { echo $LPF_VAR/notify/$1; }
+ function get_pkg_srcdir()   { echo $LPF_DATA/packages/$1/SOURCES; }
++function get_pkg_datadir()  { echo $LPF_DATA/packages/$1; }
+ function get_eula_dir()     { echo $LPF_DATA/packages/$1/eula; }
+ function get_spec()         { echo $LPF_DATA/packages/$1/$1.spec; }
+ function _get_statefile()   { echo $LPF_VAR/packages/$1/state; }
+diff --git a/scripts/lpf-pkgbuild b/scripts/lpf-pkgbuild
+index 5d1b83d..136ebde 100755
+--- a/scripts/lpf-pkgbuild
++++ b/scripts/lpf-pkgbuild
+@@ -43,12 +43,15 @@ function build_pkg()
+     local pkg="$1"
+     local spec=$( get_spec $pkg )
+     local buildlog=$( get_logfile $pkg )
++    local pkgdir=$( get_pkg_datadir $pkg )
+     rm -rf $rpm_rpmdir/* &> /dev/null
+     rm -rf $rpm_srcdir/* &> /dev/null
+     [ -w "$rpm_srcdir" ] || rpmdev-setuptree
+ 
+     exec 5<&1 6<&2  # Preserve  stdout/stderr.
+     exec &>> $buildlog
++    source $scriptdir/../CONFIG
++    [ -f $pkgdir/CONFIG ] && source $pkgdir/CONFIG
+     cd $rpm_srcdir
+     cp $( get_pkg_srcdir $pkg )/* $PWD &>/dev/null || :
+     echo "$pkg: downloading sources" >&5 && spectool -g $spec &&
+-- 
+1.8.4.2
+
diff --git a/lpf.spec b/lpf.spec
index 9c21fd3..7effdeb 100644
--- a/lpf.spec
+++ b/lpf.spec
@@ -3,7 +3,7 @@
 
 Name:           lpf
 Version:        0.1
-Release:        5.%{shortcommit}%{?dist}
+Release:        6.%{shortcommit}%{?dist}
 Summary:        Local package factory - build non-redistributable rpms
 
                 # Icon from iconarchive.com
@@ -30,6 +30,7 @@ Requires(pre):  shadow-utils
 
 Patch1:        	0001-README-Add-a-note-on-dependencies-22.patch
 Patch2:         0002-lpf-Bugfix.patch
+Patch3:         0003-pkgbuild-Bugfix-respect-CONFIG-bz-1057878.patch
 
 
 %description
@@ -47,6 +48,7 @@ Besides being interactive the operation is similar to akmod and dkms.
 %setup -qn lpf-%{commit}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 rm -rf examples
 
 
@@ -104,6 +106,9 @@ fi
 
 
 %changelog
+* Mon Jan 27 2014 Alec Leamas <leamas.alec at gmail.com> - 0.1-6.36e5aa0
+- Patch for bz #1057878 added.
+
 * Thu Jan 23 2014 Alec Leamas <leamas.alec at gmail.com> - 0.1-5.36e5aa0
 - Adding two patches, doc update + bugfix in lpf script.