rpms/qjackctl/devel qjackctl.spec, 1.4, 1.5 sources, 1.3, 1.4 qjackctl-0.2.20-freebob.patch, 1.1, NONE

[Anthony Green (green)]

Author: green

Update of /cvs/extras/rpms/qjackctl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26590

Modified Files:
	qjackctl.spec sources 
Removed Files:
	qjackctl-0.2.20-freebob.patch 
Log Message:
New upstream.



Index: qjackctl.spec
===================================================================
RCS file: /cvs/extras/rpms/qjackctl/devel/qjackctl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qjackctl.spec	15 Sep 2006 00:55:21 -0000	1.4
+++ qjackctl.spec	11 Nov 2007 14:16:22 -0000	1.5
@@ -2,13 +2,12 @@
 
 Summary: Qt based JACK control application
 Name: qjackctl
-Version: 0.2.20
-Release: 7%{?dist}
+Version: 0.3.1a
+Release: 1%{?dist}
 URL: http://qjackctl.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/qjackctl/qjackctl-%{version}.tar.gz
 Source1: qjackctl.desktop
-Patch0: qjackctl-0.2.20-freebob.patch
-License: GPL
+License: GPLv2+
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: hicolor-icon-theme
@@ -27,7 +26,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure
@@ -39,7 +37,10 @@
 
 # move icon to the proper freedesktop location
 %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-%{__mv} %{buildroot}%{_datadir}/icons/qjackctl.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+%{__mv} %{buildroot}%{_datadir}/pixmaps/qjackctl.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
+
+# Delete the upstream desktop file
+%{__rm} %{buildroot}%{_datadir}/applications/qjackctl.desktop
 
 # desktop file categories
 BASE="X-Fedora Application AudioVideo"
@@ -74,6 +75,10 @@
 %{_datadir}/applications/%{desktop_vendor}-qjackctl.desktop
 
 %changelog
+* Sun Nov 12 2007 Anthony Green <green at redhat.com> 0.3.1a-1
+- New upstream.
+- Tweak License.
+
 * Thu Sep 14 2006 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.2.20-7
 - fixed typo in patch filename
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qjackctl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Sep 2006 00:49:11 -0000	1.3
+++ sources	11 Nov 2007 14:16:22 -0000	1.4
@@ -1,2 +1 @@
-04141b66ba0b06d8acc92fdd442192fe  qjackctl-0.2.20.tar.gz
-2931b60d9e722d9284aedaa46a6a894b  qjackctl-0.2.20-freebob.patch
+070135c2c65c27f8a5ab83710225120e  qjackctl-0.3.1a.tar.gz


--- qjackctl-0.2.20-freebob.patch DELETED ---