domcleal pushed to freight (epel7). "Fix more loading of libs from /usr/share"

[notifications at fedoraproject.org]

From 02bcdfb831d20f661c8d5c04dfb78e1bc3ca4a72 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dcleal at redhat.com>
Date: Thu, 4 Jun 2015 14:33:04 +0100
Subject: Fix more loading of libs from /usr/share


diff --git a/freight-0.3.5-libs-usrshare.patch b/freight-0.3.5-libs-usrshare.patch
index 28d8447..109ab4a 100644
--- a/freight-0.3.5-libs-usrshare.patch
+++ b/freight-0.3.5-libs-usrshare.patch
@@ -1,16 +1,17 @@
-From 1efabf417928a849f7e842a3388259b947d5453c Mon Sep 17 00:00:00 2001
+From 5e8648f5014ac4c79e45b8ae073a31a0a0968e14 Mon Sep 17 00:00:00 2001
 From: Dominic Cleal <dcleal at redhat.com>
 Date: Thu, 4 Jun 2015 10:31:50 +0100
 Subject: [PATCH] Load libs from /usr/share/freight
 
 ---
- bin/freight-add         | 2 +-
+ bin/freight-add         | 4 ++--
  bin/freight-cache       | 2 +-
- bin/freight-clear-cache | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ bin/freight-clear-cache | 4 ++--
+ lib/freight/conf.sh     | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/bin/freight-add b/bin/freight-add
-index 603b8d9..1362b4a 100755
+index 15cc87d..7b990c7 100755
 --- a/bin/freight-add
 +++ b/bin/freight-add
 @@ -26,7 +26,7 @@ do
@@ -22,6 +23,15 @@ index 603b8d9..1362b4a 100755
  
  # The non-option argument(s) following the last option are package files.
  # Binary packages have only one but source packages require two or three.
+@@ -75,7 +75,7 @@ do
+                 echo "# [freight] added $PATHNAME to $DIRNAME" >&2 ||
+                 echo "# [freight] $DIRNAME already has $PATHNAME" >&2;;
+             *.deb)
+-                . "$(dirname "$(dirname "$0")")/lib/freight/apt.sh"
++                . "/usr/share/freight/apt.sh"
+                 dpkg-deb -I "$TMP/$FILENAME" "control" >"$TMP/$FILENAME-control"
+                 DEBNAME="$(
+                     apt_binary_name "$TMP/$FILENAME-control"
 diff --git a/bin/freight-cache b/bin/freight-cache
 index c6e8fcc..170952d 100755
 --- a/bin/freight-cache
@@ -36,7 +46,7 @@ index c6e8fcc..170952d 100755
  
  # If `GPG_PASSPHRASE_FILE` is set the specified file should exist and be
 diff --git a/bin/freight-clear-cache b/bin/freight-clear-cache
-index d120859..b7f7c17 100755
+index d120859..9737b06 100755
 --- a/bin/freight-clear-cache
 +++ b/bin/freight-clear-cache
 @@ -27,7 +27,7 @@ do
@@ -48,6 +58,28 @@ index d120859..b7f7c17 100755
  
  # Create a working directory on the same device as the Freight cache.
  mkdir -p "$VARCACHE"
+@@ -61,7 +61,7 @@ do
+ 	DIST="$(basename "$DIR")"
+ 
+ 	# From here the process is customized on a per-manager basis.
+-	. "$(dirname "$(dirname "$0")")/lib/freight/$MANAGER.sh"
++	. "/usr/share/freight/$MANAGER.sh"
+ 	eval "${MANAGER}_clear_cache" "$DIST"
+ 
+ done
+diff --git a/lib/freight/conf.sh b/lib/freight/conf.sh
+index 06f85d3..dc567e3 100644
+--- a/lib/freight/conf.sh
++++ b/lib/freight/conf.sh
+@@ -17,7 +17,7 @@ CACHE="off"
+ SYMLINKS="off"
+ 
+ # Source all existing configuration files from lowest- to highest-priority.
+-PREFIX="$(dirname $(dirname $0))"
++PREFIX="/usr"
+ if [ "$PREFIX" = "/usr" ]
+ then [ -f "/etc/freight.conf" ] && . "/etc/freight.conf"
+ else [ -f "$PREFIX/etc/freight.conf" ] && . "$PREFIX/etc/freight.conf"
 -- 
 2.1.0
 
diff --git a/freight.spec b/freight.spec
index 3ff4ee2..664dad3 100644
--- a/freight.spec
+++ b/freight.spec
@@ -2,7 +2,7 @@
 
 Name:    freight
 Version: 0.3.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A modern take on the Debian archive
 
 Group:   Development/Tools
@@ -58,6 +58,9 @@ find %{buildroot}%{_sysconfdir} -type f -size 0 -delete
 %doc LICENSE NOTES README.md
 
 %changelog
+* Thu Jun 04 2015 Dominic Cleal <dcleal at redhat.com> - 0.3.5-7
+- Fix more loading of libs from /usr/share
+
 * Thu Jun 04 2015 Dominic Cleal <dcleal at redhat.com> - 0.3.5-6
 - Fix loading of libs from /usr/share
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/freight.git/commit/?h=epel7&id=02bcdfb831d20f661c8d5c04dfb78e1bc3ca4a72