From 4fdad76c5baad7ca4a41694411c60846a336ebb8 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 27 May 2016 11:59:11 -0400
Subject: [PATCH] Two fixes for non-bundled build

In the non-bundled case:

 - Don't exclude requires on libhif
 - Don't inject an RPATH
---
 rpm-ostree.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index 86f9088..bb3f631 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -37,6 +37,9 @@ BuildRequires: libattr-devel
 BuildRequires: pkgconfig(librepo)
 
 %if %{with bundled_libhif}
+# We're using RPATH to pick up our bundled version
+%global __requires_exclude ^libhif[.]so[.].*$
+
 BuildRequires: cmake
 BuildRequires: pkgconfig(expat)
 BuildRequires: pkgconfig(check)
@@ -58,9 +61,6 @@ Requires: ostree >= 2014.6
 Provides: rpm-ostree-client
 %endif
 
-# We're using RPATH to pick up our bundled version
-%global __requires_exclude ^libhif[.]so[.].*$
-
 %description
 This tool binds together the world of RPM packages with the OSTree
 model of bootable filesystem trees.  It provides commands usable both
@@ -105,7 +105,12 @@ export PKG_CONFIG_PATH=$(pwd)/libhif/libhif${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
 export LD_LIBRARY_PATH=$(pwd)/libhif/libhif${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 %endif
 env NOCONFIGURE=1 ./autogen.sh
-%configure --disable-silent-rules --enable-gtk-doc LDFLAGS='-Wl,-rpath=%{_libdir}/rpm-ostree'
+%configure --disable-silent-rules --enable-gtk-doc \
+%if %{with bundled_libhif}
+LDFLAGS='-Wl,-rpath=%{_libdir}/rpm-ostree'
+%else
+
+%endif
 make %{?_smp_mflags}
 
 %install