rpms/rosegarden4/devel .cvsignore, 1.6, 1.7 rosegarden4.spec, 1.10, 1.11 sources, 1.6, 1.7 rosegarden-1.5.1-desktop-file.patch, 1.1, NONE rosegarden-1.6.0-fix-cmake-optflags.patch, 1.1, NONE rosegarden-1.6.1-gcc43.patch, 1.1, NONE

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/rosegarden4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13457

Modified Files:
	.cvsignore rosegarden4.spec sources 
Removed Files:
	rosegarden-1.5.1-desktop-file.patch 
	rosegarden-1.6.0-fix-cmake-optflags.patch 
	rosegarden-1.6.1-gcc43.patch 
Log Message:
* Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.7.3-1
- New upstream version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Feb 2008 00:18:49 -0000	1.6
+++ .cvsignore	6 Mar 2009 23:47:30 -0000	1.7
@@ -1 +1 @@
-rosegarden-1.6.1.tar.bz2
+rosegarden-1.7.3.tar.bz2


Index: rosegarden4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/rosegarden4.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rosegarden4.spec	25 Feb 2009 20:18:57 -0000	1.10
+++ rosegarden4.spec	6 Mar 2009 23:47:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:      rosegarden4
-Version:   1.6.1
-Release:   3%{?dist}
+Version:   1.7.3
+Release:   1%{?dist}
 Summary:   MIDI, audio and notation editor
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -8,10 +8,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://downloads.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2
-Patch0:  rosegarden-1.6.0-fix-cmake-optflags.patch
-Patch1:  rosegarden-1.5.1-desktop-file.patch
 Patch2:  rosegarden-1.5.1-lib64.patch
-Patch3:  rosegarden-1.6.1-gcc43.patch
 
 BuildRequires: cmake
 BuildRequires: gettext
@@ -34,26 +31,34 @@
 
 %prep
 %setup -q -n rosegarden-%{version}
-%patch0 -p1
-%patch1 -p1
 # Look for LADSPA/DSSI plugins in the correct place on 64bit platforms 
 %if "%{_lib}" == "lib64"
 %patch2 -p1
 %endif
-%patch3 -p1 -b .gcc43
+
+# Fix permissions:
+chmod 644 src/commands/segment/SegmentSplitTwiceCommand.*
+
+# Add GenericName to the desktop file:
+echo "GenericName=Audio and MIDI Sequencer" >> data/desktop/rosegarden.desktop
 
 %build
-%cmake .
+%cmake . -DCMAKE_CXX_FLAGS="%{optflags}"
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
+mv %{buildroot}%{_datadir}/applications/kde/rosegarden.desktop \
+   %{buildroot}%{_datadir}/applications/
+
 desktop-file-install --vendor fedora \
   --dir %{buildroot}%{_datadir}/applications \
   --delete-original \
-  %{buildroot}%{_datadir}/applications/kde/rosegarden.desktop
+  --remove-category X-SuSE-Sequencer \
+  --remove-category X-Red-Hat-Base \
+  %{buildroot}%{_datadir}/applications/rosegarden.desktop
 
 %find_lang rosegarden
 
@@ -65,23 +70,23 @@
 
 %post
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-# locolor seems to be a KDE thing?
-touch --no-create %{_datadir}/icons/locolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/icons/locolor &>/dev/null || :
 
 %postun
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/locolor &>/dev/null || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
-touch --no-create %{_datadir}/icons/locolor || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files -f rosegarden.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{_bindir}/rosegarden
 %{_bindir}/rosegarden-audiofile-importer
@@ -109,6 +114,9 @@
 %{_datadir}/mimelnk/audio/x-soundfont.desktop
 
 %changelog
+* Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.7.3-1
+- New upstream version.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Feb 2008 00:18:49 -0000	1.6
+++ sources	6 Mar 2009 23:47:30 -0000	1.7
@@ -1 +1 @@
-60efd0d0afcb3632d8188ef25082bcf9  rosegarden-1.6.1.tar.bz2
+122eab42e375d2f3b009c8540ae8069c  rosegarden-1.7.3.tar.bz2


--- rosegarden-1.5.1-desktop-file.patch DELETED ---


--- rosegarden-1.6.0-fix-cmake-optflags.patch DELETED ---


--- rosegarden-1.6.1-gcc43.patch DELETED ---