From 3d6890d9dbe6e01dcd203a6cc15fac28c6c13744 Mon Sep 17 00:00:00 2001
From: Orcan Ogetbil <oget@fedoraproject.org>
Date: Oct 24 2009 18:01:12 +0000
Subject: - Update to 0.3.5


---

diff --git a/.cvsignore b/.cvsignore
index 443ee0e..82e10ff 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-qjackctl-0.3.4.tar.gz
+qjackctl-0.3.5.tar.gz
diff --git a/qjackctl-0.3.3-qt45.patch b/qjackctl-0.3.3-qt45.patch
deleted file mode 100644
index c85e6f8..0000000
--- a/qjackctl-0.3.3-qt45.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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:23:44.000000000 -0400
-@@ -300,6 +300,9 @@ int main ( int argc, char **argv )
- 	Qt::WindowFlags wflags = Qt::Window
- #if QT_VERSION >= 0x040200
- 		| Qt::CustomizeWindowHint
-+#if QT_VERSION >= 0x040500
-+		| Qt::WindowCloseButtonHint
-+#endif
- #endif
- 		| Qt::WindowTitleHint
- 		| Qt::WindowSystemMenuHint
-diff -rupN qjackctl-0.3.4.old/src/qjackctlMainForm.cpp qjackctl-0.3.4/src/qjackctlMainForm.cpp
---- qjackctl-0.3.4.old/src/qjackctlMainForm.cpp	2008-10-02 12:18:12.000000000 -0400
-+++ qjackctl-0.3.4/src/qjackctlMainForm.cpp	2009-04-06 22:25:28.000000000 -0400
-@@ -370,6 +370,9 @@ bool qjackctlMainForm::setup ( qjackctlS
- 	Qt::WindowFlags wflags = Qt::Window
- #if QT_VERSION >= 0x040200
- 		| Qt::CustomizeWindowHint
-+#if QT_VERSION >= 0x040500
-+		| Qt::WindowCloseButtonHint
-+#endif
- #endif
- 		| Qt::WindowTitleHint
- 		| Qt::WindowSystemMenuHint
diff --git a/qjackctl.desktop b/qjackctl.desktop
deleted file mode 100644
index caffb84..0000000
--- a/qjackctl.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Qjackctl
-Comment=JACK control application
-Icon=qjackctl.png
-Type=Application
-Exec=qjackctl
-Terminal=false
-Encoding=UTF-8
diff --git a/qjackctl.spec b/qjackctl.spec
index 3fc57d1..3c180c5 100644
--- a/qjackctl.spec
+++ b/qjackctl.spec
@@ -2,13 +2,10 @@
 
 Summary:       Qt based JACK control application
 Name:          qjackctl
-Version:       0.3.4
+Version:       0.3.5
 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
 # We don't want .qm files in the default locale dir
 Patch1:        qjackctl-fix-locale-path.patch
 License:       GPLv2+
@@ -30,9 +27,11 @@ patchbay and connection control features.
 
 %prep
 %setup -q
-%patch0 -p1 -b .qt45
 %patch1 -p1 -b .localedir
 
+# Remove absolute paths:
+sed -i 's|@ac_prefix@.*|qjackctl|' qjackctl.desktop.in
+
 %build
 QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix}
 %{__make} %{?_smp_mflags}
@@ -49,14 +48,15 @@ QT4DIR=%{_qt4_libdir} QMAKE=%{_qt4_qmake} %configure --with-qt=%{_qt4_prefix}
 %{__rm} %{buildroot}%{_datadir}/applications/qjackctl.desktop
 
 # desktop file categories
-BASE="X-Fedora Application AudioVideo"
 XTRA="X-Jack"
-
+RMCAT="MIDI JACK ALSA"
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
+
 desktop-file-install --vendor %{desktop_vendor} \
   --dir %{buildroot}%{_datadir}/applications \
-  `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
-  %{SOURCE1}
+  `for c in ${XTRA} ; do echo "--add-category $c " ; done` \
+  `for c in ${RMCAT} ; do echo "--remove-category $c " ; done` \
+  qjackctl.desktop
 
 # Create the lang file. %%find_lang does not handle .qm files
 for file in %{buildroot}%{_datadir}/qjackctl/locale/*.qm; do
@@ -89,6 +89,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Fri Oct 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.5-1
+- Update to 0.3.5
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Apr 17 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> 0.3.4-1
 - Update to 0.3.4
 - Update scriptlets according to the new guidelines
diff --git a/sources b/sources
index dbc8945..b0dd0cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65736e83650468256ba22aa5d35fd0cb  qjackctl-0.3.4.tar.gz
+08792978e822509209728b02d071a757  qjackctl-0.3.5.tar.gz