rpms/qsynth/F-9 qsynth-0.3.3-qt4.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 qsynth.spec, 1.4, 1.5 sources, 1.2, 1.3 qsynth.desktop, 1.1, NONE

Sat Sep 6 03:57:02 UTC 2008

Author: salimma

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

Modified Files:
	.cvsignore qsynth.spec sources 
Added Files:
	qsynth-0.3.3-qt4.patch 
Removed Files:
	qsynth.desktop 
Log Message:
- Fix desktop file and AUTHORS; commit to F-9 branch



qsynth-0.3.3-qt4.patch:

--- NEW FILE qsynth-0.3.3-qt4.patch ---
--- qsynth-0.3.3/configure.qt4	2008-07-10 13:13:33.000000000 -0400
+++ qsynth-0.3.3/configure	2008-09-05 19:16:02.000000000 -0400
@@ -3859,7 +3859,7 @@
 
 # Check for Qt qmake utility.
 # Extract the first word of "qmake", so it can be a program name with args.
-set dummy qmake; ac_word=$2
+set dummy qmake-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_qmake+set}" = set; then
@@ -3908,7 +3908,7 @@
 
 # Check for Qt moc utility.
 # Extract the first word of "moc", so it can be a program name with args.
-set dummy moc; ac_word=$2
+set dummy moc-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_moc+set}" = set; then
@@ -3957,7 +3957,7 @@
 
 # Check for Qt uic utility.
 # Extract the first word of "uic", so it can be a program name with args.
-set dummy uic; ac_word=$2
+set dummy uic-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_uic+set}" = set; then
@@ -4006,7 +4006,7 @@
 
 # Check for Qt lupdate utility.
 # Extract the first word of "lupdate", so it can be a program name with args.
-set dummy lupdate; ac_word=$2
+set dummy lupdate-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_lupdate+set}" = set; then
@@ -4055,7 +4055,7 @@
 
 # Check for Qt lrelease utility.
 # Extract the first word of "lrelease", so it can be a program name with args.
-set dummy lrelease; ac_word=$2
+set dummy lrelease-qt4; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_ac_lrelease+set}" = set; then


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Jul 2006 22:14:13 -0000	1.2
+++ .cvsignore	6 Sep 2008 03:56:32 -0000	1.3
@@ -1 +1 @@
-qsynth-0.2.5.tar.gz
+qsynth-0.3.3.tar.gz


Index: qsynth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-9/qsynth.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qsynth.spec	19 Feb 2008 15:59:43 -0000	1.4
+++ qsynth.spec	6 Sep 2008 03:56:32 -0000	1.5
@@ -2,12 +2,14 @@
 
 Summary: Qt based Fluidsynth GUI front end
 Name: qsynth
-Version: 0.2.5
-Release: 7%{?dist}
+Version: 0.3.3
+Release: 1%{?dist}
 URL: http://qsynth.sourceforge.net
-Source0: http://dl.sf.net/sourceforge/qsynth/qsynth-%{version}.tar.gz
-Source1: qsynth.desktop
-License: GPL
+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
+License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: hicolor-icon-theme
@@ -16,7 +18,7 @@
 
 %description
 QSynth is a fluidsynth GUI front-end application written in C++ around
-the Qt3 toolkit using Qt Designer. Eventually it may evolve into a
+the Qt4 toolkit using Qt Designer. Eventually it may evolve into a
 softsynth management application allowing the user to control and
 manage a variety of command line softsynth but for the moment it wraps
 the excellent FluidSynth. FluidSynth is a command line software
@@ -24,52 +26,53 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .qt4
+iconv --from=ISO88591 --to=UTF8 AUTHORS -o AUTHORS
+
 
 %build
 %configure
 %{__make} %{?_smp_mflags}
 
+
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 
-# move icon to the proper freedesktop location
-%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-%{__mv} %{buildroot}%{_datadir}/icons/qsynth.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-
 # desktop file categories
-BASE="X-Fedora Application AudioVideo"
-XTRA="X-Jack X-Synthesis"
+INCORRECT="Applications Multimedia MIDI JACK ALSA"
+BASE="Audio"
+XTRA="X-MIDI X-Jack X-Alsa X-Synthesis"
 
 %{__mkdir} -p %{buildroot}%{_datadir}/applications
 desktop-file-install --vendor %{desktop_vendor} \
+  --delete-original \
   --dir %{buildroot}%{_datadir}/applications    \
+  `for c in ${INCORRECT} ; do echo "--remove-category $c " ; done` \
   `for c in ${BASE} ${XTRA} ; do echo "--add-category $c " ; done` \
-  %{SOURCE1}
+  %{buildroot}%{_datadir}/applications/qsynth.desktop
+
 
 %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
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/qsynth
-%{_datadir}/icons/hicolor/32x32/apps/qsynth.png
+%{_datadir}/pixmaps/qsynth.png
+%{_datadir}/locale/qsynth_*.qm
 %{_datadir}/applications/%{desktop_vendor}-qsynth.desktop
 
+
 %changelog
+* Fri Sep  5 2008 Michel Salim <salimma at fedoraproject.org> - 0.3.3-1
+- Update to 0.3.3
+
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.5-8
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.5-7
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qsynth/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Jul 2006 22:14:13 -0000	1.2
+++ sources	6 Sep 2008 03:56:32 -0000	1.3
@@ -1 +1 @@
-24a1ce00876a79a409fa28d0e8b3221f  qsynth-0.2.5.tar.gz
+648c49d8935814be03f4001f42b169cf  qsynth-0.3.3.tar.gz


--- qsynth.desktop DELETED ---


