rpms/rosegarden4/F-8 rosegarden-1.6.0-fix-cmake-optflags.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rosegarden4.spec, 1.5, 1.6 sources, 1.4, 1.5

[Callum Lerwick (seg)]

Author: seg

Update of /cvs/extras/rpms/rosegarden4/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1070

Modified Files:
	.cvsignore rosegarden4.spec sources 
Added Files:
	rosegarden-1.6.0-fix-cmake-optflags.patch 
Log Message:
* Wed Dec 12 2007 Callum Lerwick <seg at haxxed.com> - 1.6.0-1
- New upstream version.
- Patch cmakelists to use our optflags. (bz330631)


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

--- NEW FILE rosegarden-1.6.0-fix-cmake-optflags.patch ---
diff -ur rosegarden-1.6.0/CMakeLists.txt rosegarden-1.6.0.patched/CMakeLists.txt
--- rosegarden-1.6.0/CMakeLists.txt	2007-12-06 10:15:05.000000000 -0600
+++ rosegarden-1.6.0.patched/CMakeLists.txt	2007-12-12 13:31:26.000000000 -0600
@@ -63,6 +63,8 @@
     ADD_DEFINITIONS(-DNO_SOUND)
 ENDIF(NOT WANT_SOUND)
 
+SET(CMAKE_CXX_FLAGS_BACKUP ${CMAKE_CXX_FLAGS})
+
 # Check for KDE3
 FIND_PACKAGE(KDE3 REQUIRED QUIET)
 IF(QT_FOUND)
@@ -82,7 +84,7 @@
 ENDIF(KDE3_FOUND)
 
 # Clear the flags set by FindKDE3 
-SET(CMAKE_CXX_FLAGS "")
+SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS_BACKUP})
 MARK_AS_ADVANCED(KDE3_BUILD_TESTS
                  KDE3_ENABLE_FINAL
 		 KDE3_DCOPIDL_EXECUTABLE
@@ -274,9 +276,9 @@
 ENDIF(PTHREAD_HAS_MUTEX_RECURSIVE)
 # End of PTHREAD_MUTEX_RECURSIVE Test
 
-SET(CMAKE_CXX_FLAGS_RELEASE         "-O2 -w -fexceptions -DNDEBUG")
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO  "-O2 -g -Wall -fexceptions -DDEBUG")
-SET(CMAKE_CXX_FLAGS_DEBUG           "-O0 -g3 -Wall -fexceptions -DDEBUG")
+SET(CMAKE_CXX_FLAGS_RELEASE         "-fexceptions -DNDEBUG")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO  "-fexceptions -DDEBUG")
+SET(CMAKE_CXX_FLAGS_DEBUG           "-fexceptions -DDEBUG")
 
 MESSAGE(STATUS "Rosegarden ${VERSION} will be built for install into ${CMAKE_INSTALL_PREFIX}")
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 May 2007 22:17:13 -0000	1.4
+++ .cvsignore	13 Dec 2007 03:27:25 -0000	1.5
@@ -1 +1 @@
-rosegarden-1.5.1.tar.bz2
+rosegarden-1.6.0.tar.bz2


Index: rosegarden4.spec
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/F-8/rosegarden4.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rosegarden4.spec	10 May 2007 22:17:13 -0000	1.5
+++ rosegarden4.spec	13 Dec 2007 03:27:25 -0000	1.6
@@ -1,15 +1,17 @@
 Name:      rosegarden4
-Version:   1.5.1
+Version:   1.6.0
 Release:   1%{?dist}
 Summary:   MIDI, audio and notation editor
 Group:     Applications/Multimedia
-License:   GPL
+License:   GPLv2+
 URL:       http://www.rosegardenmusic.com/
-Source0:   http://dl.sourceforge.net/sourceforge/rosegarden/rosegarden-%{version}.tar.bz2
-Patch0:    rosegarden-1.5.1-desktop-file.patch
-Patch1:    rosegarden-1.5.1-lib64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://dl.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
+
 BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
@@ -36,9 +38,10 @@
 %prep
 %setup -q -n rosegarden-%{version}
 %patch0 -p1
+%patch1 -p1
 # Look for LADSPA/DSSI plugins in the correct place on x86_64
 %ifarch x86_64
-%patch1 -p1
+%patch2 -p1
 %endif
 
 %build
@@ -51,9 +54,8 @@
 
 desktop-file-install --vendor fedora \
   --dir %{buildroot}%{_datadir}/applications \
-  --add-category X-Fedora \
   --delete-original \
-  %{buildroot}%{_datadir}/applications/rosegarden.desktop
+  %{buildroot}%{_datadir}/applications/kde/rosegarden.desktop
 
 %find_lang rosegarden
 
@@ -89,6 +91,7 @@
 %{_bindir}/rosegarden-project-package
 %{_bindir}/rosegardensequencer
 %{_datadir}/applications/fedora-rosegarden.desktop
+%{_datadir}/apps/profiles/rosegarden.profile.xml
 %{_datadir}/apps/rosegarden/
 %{_docdir}/HTML/*/rosegarden/
 %{_datadir}/icons/hicolor/16x16/apps/rosegarden.png
@@ -108,6 +111,10 @@
 %{_datadir}/mimelnk/audio/x-soundfont.desktop
 
 %changelog
+* Wed Dec 12 2007 Callum Lerwick <seg at haxxed.com> - 1.6.0-1
+- New upstream version.
+- Patch cmakelists to use our optflags. (bz330631)
+
 * Wed May 02 2007 Callum Lerwick <seg at haxxed.com> - 1.5.1-1
 - New upstream version.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rosegarden4/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 May 2007 22:17:13 -0000	1.4
+++ sources	13 Dec 2007 03:27:25 -0000	1.5
@@ -1 +1 @@
-6bf152e54b62de22c67d9899e8f9d5c2  rosegarden-1.5.1.tar.bz2
+bd41516250914244a214f9c3ee636cf8  rosegarden-1.6.0.tar.bz2