From 3f6235925f0856e99364953fc9016aa7224502c4 Mon Sep 17 00:00:00 2001
From: Orcan Ogetbil <oget.fedora@gmail.com>
Date: Feb 19 2016 02:24:46 +0000
Subject: New version


---

diff --git a/.gitignore b/.gitignore
index e309cd4..feebd18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ qjackctl-0.3.6.tar.gz
 /qjackctl-0.3.9.tar.gz
 /qjackctl-0.3.10.tar.gz
 /qjackctl-0.3.12.tar.gz
+/qjackctl-0.4.1.tar.gz
diff --git a/qjackctl.spec b/qjackctl.spec
index 543e499..f6dc1f8 100644
--- a/qjackctl.spec
+++ b/qjackctl.spec
@@ -1,20 +1,21 @@
 Summary:       Qt based JACK control application
 Name:          qjackctl
-Version:       0.3.12
-Release:       5%{?dist}
+Version:       0.4.1
+Release:       1%{?dist}
 URL:           http://qjackctl.sourceforge.net
 Source0:       http://downloads.sourceforge.net/qjackctl/files/%{name}-%{version}.tar.gz
 License:       GPLv2+
 Group:         Applications/Multimedia
 Requires:      hicolor-icon-theme
 
-Source20: qmake-qt4.sh
+Source20:      qmake-qt5.sh
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: portaudio-devel
-BuildRequires: qt4-devel
+BuildRequires: qt5-qttools-devel
+BuildRequires: qt5-qtx11extras-devel
 
 %description
 Qjackctl is a simple application to control the JACK sound server daemon,
@@ -27,17 +28,26 @@ 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
+
 %build
 CFLAGS="%{optflags}"; export CFLAGS
 CXXFLAGS="%{optflags}"; export CXXFLAGS
 LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
 
 # force use of custom/local qmake, to inject proper build flags (above)
-install -m755 -D %{SOURCE20} bin/qmake-qt4
-PATH=`pwd`/bin:%{_qt4_bindir}:$PATH; export PATH
+install -m755 -D %{SOURCE20} bin/qmake-qt5
+PATH=`pwd`/bin:%{_qt5_bindir}:$PATH; export PATH
 
-QT4DIR=%{_qt4_libdir} QMAKE=qmake-qt4 \
-  %configure --with-qt=%{_qt4_prefix} \
+QT5DIR=%{_qt5_libdir} QMAKE=qmake-qt5\
+  %configure --with-qt5=%{_qt5_prefix}\
              --enable-jack-version \
              --localedir=%{_datadir}/%{name}/locale/
 make %{?_smp_mflags}
@@ -71,8 +81,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/32x32/apps/qjackctl.png
 %{_datadir}/applications/qjackctl.desktop
 %{_mandir}/man1/%{name}*
+%{_datadir}/appdata/qjackctl.appdata.xml
 
 %changelog
+* Thu Feb 18 2016 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.4.1-1
+- New version
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.12-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/qmake-qt4.sh b/qmake-qt4.sh
deleted file mode 100755
index 9eac28c..0000000
--- a/qmake-qt4.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-/usr/bin/qmake-qt4 \
-  $@ \
-  QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
-  QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
-  QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
-  QMAKE_STRIP=
diff --git a/qmake-qt5.sh b/qmake-qt5.sh
new file mode 100755
index 0000000..291594a
--- /dev/null
+++ b/qmake-qt5.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+/usr/bin/qmake-qt5 \
+  $@ \
+  QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
+  QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+  QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
+  QMAKE_STRIP= \
+  QMAKE_DEFAULT_INCDIRS=
diff --git a/sources b/sources
index d076bb5..34e4d41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-441800d633f0b1fb767ba4320f25f638  qjackctl-0.3.12.tar.gz
+6a0a4245e2b9e470e04009e1d0f29f08  qjackctl-0.4.1.tar.gz