diff --git a/.gitignore b/.gitignore index c33a412..608ddb4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ qjackctl-0.3.6.tar.gz /qjackctl-0.5.4.tar.gz /qjackctl-0.5.5.tar.gz /qjackctl-0.6.2.tar.gz +/qjackctl-0.6.3.tar.gz diff --git a/qjackctl.spec b/qjackctl.spec index b2a6ae2..8e262d5 100644 --- a/qjackctl.spec +++ b/qjackctl.spec @@ -1,14 +1,12 @@ Summary: Qt based JACK control application Name: qjackctl -Version: 0.6.2 -Release: 2%{?dist} +Version: 0.6.3 +Release: 1%{?dist} URL: http://qjackctl.sourceforge.net Source0: http://downloads.sourceforge.net/qjackctl/files/%{name}-%{version}.tar.gz License: GPLv2+ Requires: hicolor-icon-theme -Source20: qmake-qt5.sh - # Appdata fix. Upstreamable Patch0: qjackctl-appdata-fix.patch @@ -19,6 +17,8 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: portaudio-devel BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtx11extras-devel +BuildRequires: libappstream-glib + %description Qjackctl is a simple application to control the JACK sound server daemon, @@ -26,7 +26,8 @@ specific for the Linux Audio Desktop infrastructure. It provides a simple GUI dialog for setting several JACK daemon parameters, which are properly saved between sessions, and a way to control the status of the audio server daemon. With time, this primordial interface has become richer by including a enhanced -patchbay and connection control features. +patch bay and connection control features. + %prep %setup -q @@ -38,22 +39,21 @@ sed -i.ac_with_paths -e "s|^ac_with_paths=.*|ac_with_paths=|g" configure %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-qt5 -PATH=`pwd`/bin:%{_qt5_bindir}:$PATH; export PATH +%{set_build_flags} %configure \ - --enable-jack-version \ - --localedir=%{_datadir}/%{name}/locale/ + --enable-jack-version \ + --localedir=%{_datadir}/%{name}/locale/ \ + --enable-debug + +%{make_build} + +%check +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/qjackctl.appdata.xml -make %{?_smp_mflags} QMAKE=`pwd`/bin/qmake-qt5 %install -make DESTDIR=%{buildroot} install +%{make_install} desktop-file-install \ %{buildroot}%{_datadir}/applications/qjackctl.desktop @@ -72,7 +72,11 @@ desktop-file-install \ %{_mandir}/man1/%{name}* %{_datadir}/metainfo/qjackctl.appdata.xml + %changelog +* Tue Sep 29 2020 Christoph Karl - 0.6.3-1 +- New version + * Wed Jul 29 2020 Fedora Release Engineering - 0.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/qmake-qt5.sh b/qmake-qt5.sh deleted file mode 100755 index 09d9fe6..0000000 --- a/qmake-qt5.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -/usr/bin/qmake-qt5 \ - "$@" \ - QMAKE_CFLAGS_RELEASE="${CFLAGS}" \ - QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \ - QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \ - QMAKE_STRIP= diff --git a/sources b/sources index 331b4fc..23ab1d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qjackctl-0.6.2.tar.gz) = a05f514d749b4f2344c7f0d57a2a0dd1ac6a97f35d0227827e78d3bd7abfbddc3201e2fc7e23f878cd318e408f169a4006a150dc0e43101086e9ba32004e5520 +SHA512 (qjackctl-0.6.3.tar.gz) = 72a9218b3b8a6b72470656e774f5cfbfe6670059e9f1a85a394345f4689c5d5c05af23b5e37d5f8dfc6159e591f64249006936069dde1632ef9d74b6f8355e0b