rpms/rosegarden4/devel .cvsignore, 1.9, 1.10 rosegarden4.spec, 1.23, 1.24 sources, 1.9, 1.10 rosegarden-qt47.patch, 1.2, NONE

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/rosegarden4/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24479

Modified Files:
	.cvsignore rosegarden4.spec sources 
Removed Files:
	rosegarden-qt47.patch 
Log Message:
* Sun May 09 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 10.04.2-1
- Update to 10.04.2
- Drop upstreamed qt-4.7 patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	23 Apr 2010 02:34:58 -0000	1.9
+++ .cvsignore	9 May 2010 10:52:35 -0000	1.10
@@ -1 +1 @@
-rosegarden-10.04.tar.bz2
+rosegarden-10.04.2.tar.bz2


Index: rosegarden4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/rosegarden4.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- rosegarden4.spec	23 Apr 2010 03:55:59 -0000	1.23
+++ rosegarden4.spec	9 May 2010 10:52:35 -0000	1.24
@@ -1,20 +1,21 @@
+%global maj 10.04
+%global min .2
+
 Name:          rosegarden4
-Version:       10.04
+Version:       %{maj}%{?min}
 Release:       1%{?dist}
 Summary:       MIDI, audio and notation editor
 Group:         Applications/Multimedia
 License:       GPLv2+
 URL:           http://www.rosegardenmusic.com/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:       http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{version}/rosegarden-%{version}.tar.bz2
-Source1:       http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{version}/rosegarden-%{version}.txt
+Source0:       http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{maj}/rosegarden-%{version}.tar.bz2
+Source1:       http://downloads.sourceforge.net/project/rosegarden/rosegarden/%{maj}/rosegarden-%{maj}.txt
 # Upstream is informed about all these patches in their mailing list
 # Fedora doesn't want fonts built into the final binary
 Patch0:        rosegarden-separate-fonts.patch
 # Look for LADSPA/DSSI plugins in the correct place on 64bit platforms 
 Patch1:        rosegarden-pluginpath.patch
-# Fix build issue against new version of qt
-Patch2:        rosegarden-qt47.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
@@ -74,7 +75,6 @@ use of Rosegarden.
 %setup -q -n rosegarden-%{version}
 %patch0 -p1 -b .fonts
 %patch1 -p1 -b .pluginpath
-%patch2 -p1 -b .qt47
 
 # Release notes
 cp -a %{SOURCE1} .
@@ -131,7 +131,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING CONTRIBUTING README rosegarden-%{version}.txt
+%doc AUTHORS COPYING CONTRIBUTING README rosegarden-%{maj}.txt
 %{_bindir}/rosegarden
 %{_datadir}/applications/fedora-rosegarden.desktop
 %{_datadir}/icons/hicolor/*/mimetypes/audio-x-rosegarden-*.png
@@ -145,6 +145,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %doc data/fonts/README
 
 %changelog
+* Sun May 09 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 10.04.2-1
+- Update to 10.04.2
+- Drop upstreamed qt-4.7 patch
+
 * Thu Apr 22 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 10.04-1
 - Update to 10.04
 - BR qt-devel instead of kdelibs-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	23 Apr 2010 02:34:58 -0000	1.9
+++ sources	9 May 2010 10:52:35 -0000	1.10
@@ -1 +1 @@
-b25f2f629f31ecf24b84db3ccbe555c9  rosegarden-10.04.tar.bz2
+e961a6f1deb2f57c2ed9dd7f1bc71a94  rosegarden-10.04.2.tar.bz2


--- rosegarden-qt47.patch DELETED ---