diff --git a/.gitignore b/.gitignore index 9e21e90..37003ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ qjackctl-0.3.6.tar.gz /qjackctl-0.3.7.tar.gz /qjackctl-0.3.8.tar.gz +/qjackctl-0.3.9.tar.gz diff --git a/qjackctl-fix-locale-path.patch b/qjackctl-fix-locale-path.patch deleted file mode 100644 index 3522b9d..0000000 --- a/qjackctl-fix-locale-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -rupN qjackctl-0.3.7.old/Makefile.in qjackctl-0.3.7/Makefile.in ---- qjackctl-0.3.7.old/Makefile.in 2010-08-23 12:27:45.000000000 -0400 -+++ qjackctl-0.3.7/Makefile.in 2010-12-10 05:36:02.000000000 -0500 -@@ -101,16 +101,16 @@ $(name).mak: $(name).pro - - install: $(target) $(translations_targets) $(name).1 - @make INSTALL_ROOT=$(DESTDIR) -f $(name).mak install -- @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale -+ @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale - @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/man/man1 -- @install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale -+ @install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale - @install -v -m 0644 $(name).1 $(DESTDIR)$(prefix)/share/man/man1/$(name).1 - - uninstall: $(DESTDIR)$(prefix)/bin/$(name) - @make INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall -- @rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets) -+ @rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/$(translations_targets) - @for x in $(translations_targets); do \ -- rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done -+ rm -vf $(DESTDIR)$(prefix)/share/$(name)/locale/`basename $$x`; done - @rm -vf $(DESTDIR)$(prefix)/share/man/man1/$(name).1 - - -diff -rupN qjackctl-0.3.7.old/src/qjackctl.cpp qjackctl-0.3.7/src/qjackctl.cpp ---- qjackctl-0.3.7.old/src/qjackctl.cpp 2010-05-18 05:31:34.000000000 -0400 -+++ qjackctl-0.3.7/src/qjackctl.cpp 2010-12-10 05:36:36.000000000 -0500 -@@ -91,7 +91,7 @@ public: - if (m_pMyTranslator->load(sLocName, sLocPath)) { - QApplication::installTranslator(m_pMyTranslator); - } else { -- sLocPath = CONFIG_PREFIX "/share/locale"; -+ sLocPath = CONFIG_PREFIX "/share/qjackctl/locale"; - if (m_pMyTranslator->load(sLocName, sLocPath)) { - QApplication::installTranslator(m_pMyTranslator); - } else { diff --git a/qjackctl.spec b/qjackctl.spec index 6a006f8..3fd2f5f 100644 --- a/qjackctl.spec +++ b/qjackctl.spec @@ -2,19 +2,15 @@ Summary: Qt based JACK control application Name: qjackctl -Version: 0.3.8 -Release: 2%{?dist} +Version: 0.3.9 +Release: 1%{?dist} URL: http://qjackctl.sourceforge.net Source0: http://downloads.sourceforge.net/qjackctl/files/%{name}-%{version}.tar.gz -# We don't want .qm files in the default locale dir -Patch1: qjackctl-fix-locale-path.patch License: GPLv2+ Group: Applications/Multimedia -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: hicolor-icon-theme BuildRequires: alsa-lib-devel -BuildRequires: autoconf automake BuildRequires: desktop-file-utils BuildRequires: jack-audio-connection-kit-devel BuildRequires: portaudio-devel @@ -30,16 +26,16 @@ patchbay and connection control features. %prep %setup -q -%patch1 -p1 -b .localedir %build -autoreconf -QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix} +QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} \ + %configure --with-qt=%{_qt4_prefix} \ + --enable-jack-version \ + --localedir=%{_datadir}/%{name}/locale/ # Parallel make fails sometimes {?_smp_mflags} make %install -rm -rf %{buildroot} make DESTDIR=%{buildroot} install desktop-file-install --vendor %{desktop_vendor} \ @@ -53,9 +49,6 @@ for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do echo %%lang\($language\) %{_datadir}/qjackctl/locale/qjackctl_$language.qm >> qjackctl.lang done -%clean -rm -rf %{buildroot} - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -70,7 +63,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f qjackctl.lang -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/qjackctl %dir %{_datadir}/qjackctl/ @@ -79,6 +71,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man1/%{name}* %changelog +* Fri May 18 2012 Orcan Ogetbil 0.3.9-1 +- New version + * Sat Jan 14 2012 Fedora Release Engineering - 0.3.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index d430ff3..b379e74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a0992c01e50d8be22064ab7b08fbc78 qjackctl-0.3.8.tar.gz +f932c916f43ba3251d3a9ed62a448e43 qjackctl-0.3.9.tar.gz