rpms/qsynth/F-10 qsynth-0.3.3-qt45.patch, NONE, 1.1 qsynth.spec, 1.7, 1.8

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/qsynth/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19116/F-10

Modified Files:
	qsynth.spec 
Added Files:
	qsynth-0.3.3-qt45.patch 
Log Message:
* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
- Fix close button not shown with Qt 4.5 (#494470)

qsynth-0.3.3-qt45.patch:

--- NEW FILE qsynth-0.3.3-qt45.patch ---
diff -rupN qsynth-0.3.3.old/src/main.cpp qsynth-0.3.3/src/main.cpp
--- qsynth-0.3.3.old/src/main.cpp	2008-07-10 13:11:48.000000000 -0400
+++ qsynth-0.3.3/src/main.cpp	2009-04-06 22:06:07.000000000 -0400
@@ -260,6 +260,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 qsynth-0.3.3.old/src/qsynthMainForm.cpp qsynth-0.3.3/src/qsynthMainForm.cpp
--- qsynth-0.3.3.old/src/qsynthMainForm.cpp	2008-07-01 10:04:41.000000000 -0400
+++ qsynth-0.3.3/src/qsynthMainForm.cpp	2009-04-06 22:05:12.000000000 -0400
@@ -544,6 +544,9 @@ void qsynthMainForm::setup ( qsynthOptio
 	Qt::WindowFlags wflags = Qt::Window
 #if QT_VERSION >= 0x040200
  		| Qt::CustomizeWindowHint
+#if QT_VERSION >= 0x040500
+	  | Qt::WindowCloseButtonHint
+#endif
 #endif
 		| Qt::WindowTitleHint
 		| Qt::WindowSystemMenuHint


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-10/qsynth.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qsynth.spec	6 Sep 2008 03:56:32 -0000	1.7
+++ qsynth.spec	10 Apr 2009 22:41:23 -0000	1.8
@@ -3,12 +3,14 @@
 Summary: Qt based Fluidsynth GUI front end
 Name: qsynth
 Version: 0.3.3
-Release: 1%{?dist}
+Release: 4%{?dist}
 URL: http://qsynth.sourceforge.net
 Source0: http://dl.sourceforge.net/qsynth/qsynth-%{version}.tar.gz
 #Source1: qsynth.desktop
 # Fedora qt4 binaries have -qt4 suffix
-Patch0:	 qsynth-0.3.3-qt4.patch
+Patch0: qsynth-0.3.3-qt4.patch
+# Fix close button not shown with Qt 4.5 (#494470)
+Patch1: qsynth-0.3.3-qt45.patch
 License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -27,12 +29,13 @@
 %prep
 %setup -q
 %patch0 -p1 -b .qt4
+%patch1 -p1 -b .qt45
 iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
 
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
+%{__make} # doesn't understand %{?_smp_mflags}
 
 
 %install
@@ -67,6 +70,15 @@
 
 
 %changelog
+* Fri Apr 10 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.3.3-4
+- Fix close button not shown with Qt 4.5 (#494470)
+
+* Sun Mar 22 2009 Robert Scheck <robert at fedoraproject.org> 0.3.3-3
+- Rebuilt without %%{?_smp_mflags} as it isn't supported
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Sep  5 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.3-1
 - Update to 0.3.3