From 880364f97d9cbb2785ea3fd5e4ecbff704ce8ee1 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Apr 18 2009 02:32:04 +0000 Subject: - Update to 0.3.4 - Update scriptlets according to the new guidelines - Use %global instead of %define per new guidelines - Fix locale dir - Fix mixed tabs&spaces issues --- diff --git a/.cvsignore b/.cvsignore index e1fa48f..443ee0e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -qjackctl-0.3.3.tar.gz +qjackctl-0.3.4.tar.gz diff --git a/qjackctl-fix-locale-path.patch b/qjackctl-fix-locale-path.patch new file mode 100644 index 0000000..af4c667 --- /dev/null +++ b/qjackctl-fix-locale-path.patch @@ -0,0 +1,39 @@ +diff -rupN qjackctl-0.3.4.old/Makefile.in qjackctl-0.3.4/Makefile.in +--- qjackctl-0.3.4.old/Makefile.in 2008-12-02 17:56:05.000000000 -0500 ++++ qjackctl-0.3.4/Makefile.in 2009-04-06 22:28:58.000000000 -0400 +@@ -85,19 +85,19 @@ install: $(name) icons/$(name).png $(tra + @install -d -v -m 0755 $(DESTDIR)$(prefix)/bin + @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps + @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications +- @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale ++ @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/$(name)/locale + @install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name) + @install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png + @install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop +- @install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale ++ @install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/$(name)/locale + + uninstall: $(DESTDIR)$(prefix)/bin/$(name) + @rm -vf $(DESTDIR)$(prefix)/bin/$(name) + @rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png + @rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop +- @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 + + clean: $(name).mak + @make -f $(name).mak clean +diff -rupN qjackctl-0.3.4.old/src/main.cpp qjackctl-0.3.4/src/main.cpp +--- qjackctl-0.3.4.old/src/main.cpp 2008-10-26 11:37:55.000000000 -0400 ++++ qjackctl-0.3.4/src/main.cpp 2009-04-06 22:28:07.000000000 -0400 +@@ -82,7 +82,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 d7cd712..3fc57d1 100644 --- a/qjackctl.spec +++ b/qjackctl.spec @@ -1,18 +1,20 @@ -%define desktop_vendor fedora - -Summary: Qt based JACK control application -Name: qjackctl -Version: 0.3.3 -Release: 3%{?dist} -URL: http://qjackctl.sourceforge.net -Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz -Source1: qjackctl.desktop +%global desktop_vendor fedora + +Summary: Qt based JACK control application +Name: qjackctl +Version: 0.3.4 +Release: 1%{?dist} +URL: http://qjackctl.sourceforge.net +Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz +Source1: qjackctl.desktop # Fix close button not shown with Qt 4.5 (#494471) -Patch0: qjackctl-0.3.3-qt45.patch -License: GPLv2+ -Group: Applications/Multimedia -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: hicolor-icon-theme +Patch0: qjackctl-0.3.3-qt45.patch +# 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: qt4-devel alsa-lib-devel jack-audio-connection-kit-devel BuildRequires: desktop-file-utils @@ -29,10 +31,10 @@ patchbay and connection control features. %prep %setup -q %patch0 -p1 -b .qt45 +%patch1 -p1 -b .localedir %build -ls -l /usr/lib*/qt4/bin -QT4DIR=%{_libdir}/qt4 QMAKE=/usr/bin/qmake-qt4 %configure --with-qt=%{_libdir}/qt4 +QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix} %{__make} %{?_smp_mflags} %install @@ -56,29 +58,44 @@ desktop-file-install --vendor %{desktop_vendor} \ `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \ %{SOURCE1} +# Create the lang file. %%find_lang does not handle .qm files +for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do + language=$(basename $file|cut -f 2 -d _|sed 's|\..*||') + echo %%lang\($language\) %{_datadir}/qjackctl/locale/qjackctl_$language.qm >> qjackctl.lang +done + %clean %{__rm} -rf %{buildroot} %post -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -%files -%defattr(-,root,root) +%posttrans +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/ %{_datadir}/icons/hicolor/32x32/apps/qjackctl.png %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop %changelog +* Fri Apr 17 2009 Orcan Ogetbil 0.3.4-1 +- Update to 0.3.4 +- Update scriptlets according to the new guidelines +- Use %%global instead of %%define per new guidelines +- Fix locale dir +- Fix mixed tabs&spaces issues + * Fri Apr 10 2009 Kevin Kofler 0.3.3-3 - Fix close button not shown with Qt 4.5 (#494471) diff --git a/sources b/sources index 6a52a99..dbc8945 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6aa20dacb954ad99db25485f2f7eeb52 qjackctl-0.3.3.tar.gz +65736e83650468256ba22aa5d35fd0cb qjackctl-0.3.4.tar.gz