From c00a81a701e6d4a82aff6ae99ae7af3d162ca542 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Feb 19 2016 17:01:58 +0000
Subject: workaround configure hard-coding /usr


---

diff --git a/qjackctl.spec b/qjackctl.spec
index f6dc1f8..6febef3 100644
--- a/qjackctl.spec
+++ b/qjackctl.spec
@@ -1,7 +1,7 @@
 Summary:       Qt based JACK control application
 Name:          qjackctl
 Version:       0.4.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 URL:           http://qjackctl.sourceforge.net
 Source0:       http://downloads.sourceforge.net/qjackctl/files/%{name}-%{version}.tar.gz
 License:       GPLv2+
@@ -28,14 +28,10 @@ patchbay and connection control features.
 %prep
 %setup -q
 
-# For some reason, the entries in bin/qmake-qt5 get ignored
-# So we add the below hacks to build the package properly:
-# 1. Don't strip the binaries
-echo "QMAKE_STRIP =" >> src/src.pro
-# 2. Don't add additional optimization flags after the Fedora flags
-echo "QMAKE_CXXFLAGS_RELEASE =" >> src/src.pro
-# 3. To avoid "-include /usr/bin" flags which breaks compilation
-echo "QMAKE_DEFAULT_INCDIRS =" >> src/src.pro
+# configure hard-codes prepending searches of /usr (already implicit, causes problems),
+# and /usr/local (not needed here), so force it's non-use -- rex
+sed -i.ac_with_paths -e "s|^ac_with_paths=.*|ac_with_paths=|g" configure
+
 
 %build
 CFLAGS="%{optflags}"; export CFLAGS
@@ -46,10 +42,10 @@ LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
 install -m755 -D %{SOURCE20} bin/qmake-qt5
 PATH=`pwd`/bin:%{_qt5_bindir}:$PATH; export PATH
 
-QT5DIR=%{_qt5_libdir} QMAKE=qmake-qt5\
-  %configure --with-qt5=%{_qt5_prefix}\
-             --enable-jack-version \
-             --localedir=%{_datadir}/%{name}/locale/
+%configure --with-qt5=%{_qt5_prefix}\
+           --enable-jack-version \
+           --localedir=%{_datadir}/%{name}/locale/
+
 make %{?_smp_mflags}
 
 %install
@@ -84,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/appdata/qjackctl.appdata.xml
 
 %changelog
+* Fri Feb 19 2016 Rex Dieter <rdieter@fedoraproject.org> 0.4.1-2
+- workaround configure hard-coding /usr
+
 * Thu Feb 18 2016 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4.1-1
 - New version
 
diff --git a/qmake-qt5.sh b/qmake-qt5.sh
index 291594a..988d8a1 100755
--- a/qmake-qt5.sh
+++ b/qmake-qt5.sh
@@ -5,5 +5,4 @@
   QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
   QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
   QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
-  QMAKE_STRIP= \
-  QMAKE_DEFAULT_INCDIRS=
+  QMAKE_STRIP=