packages: rosegarden/rosegarden-desktop.patch, rosegarden/rosegarden.spec -...

Thu Nov 24 18:47:37 CET 2011

Author: jajcus                       Date: Thu Nov 24 17:47:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Version: 11.11.11 („The current stable, but experimental release”). No KDE3 
  and Qt3 dependency any more

---- Files affected:
packages/rosegarden:
   rosegarden-desktop.patch (1.3 -> 1.4) , rosegarden.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: packages/rosegarden/rosegarden-desktop.patch
diff -u packages/rosegarden/rosegarden-desktop.patch:1.3 packages/rosegarden/rosegarden-desktop.patch:1.4

--- packages/rosegarden/rosegarden-desktop.patch:1.3	Mon Mar 31 04:11:19 2008
+++ packages/rosegarden/rosegarden-desktop.patch	Thu Nov 24 18:47:31 2011
@@ -1,17 +1,18 @@
---- rosegarden-1.6.1/data/desktop/rosegarden.desktop.orig	2008-03-31 03:52:27.489681034 +0200
-+++ rosegarden-1.6.1/data/desktop/rosegarden.desktop	2008-03-31 03:55:50.975695904 +0200
-@@ -1,13 +1,14 @@
+--- rosegarden-11.11.11/data/desktop/rosegarden.desktop.orig	2011-11-12 00:38:12.000000000 +0100
++++ rosegarden-11.11.11/data/desktop/rosegarden.desktop	2011-11-24 17:50:29.000000000 +0100
+@@ -1,7 +1,7 @@
  [Desktop Entry]
  Encoding=UTF-8
  Type=Application
 -Categories=AudioVideo;Audio;Midi;Sequencer;X-SuSE-Sequencer;X-Red-Hat-Base;
 +Categories=Qt;KDE;AudioVideo;Audio;Midi;Sequencer;
- Exec=rosegarden -caption "%c" %i %m
- MimeType=audio/x-rosegarden;audio/x-rosegarden-device
- X-KDE-NativeMimeType=audio/x-rosegarden
- Icon=rosegarden.png
- DocPath=rosegarden/index.html
- Comment=MIDI and Audio Sequencer and Editor
+ Exec=rosegarden %f
+ MimeType=audio/x-rosegarden-composition;audio/x-rosegarden-device;audio/x-rosegarden-project;audio/x-rosegarden-template;audio/x-wav;audio/midi;audio/ogg;audio/mp3;audio/x-flac;
+ X-KDE-NativeMimeType=audio/x-rosegarden-composition
+@@ -9,6 +9,7 @@
+ Comment=MIDI and Audio Sequencer and Notation Editor
+ Comment[es]=Secuenciador de MIDI y de audio y editor de partitura
+ Comment[ru]=MIDI-секвенсер и нотный редактор
 +Comment[pl]=Sekwencer i edytor MIDI i dźwięku
  Terminal=false
  Name=Rosegarden

================================================================
Index: packages/rosegarden/rosegarden.spec
diff -u packages/rosegarden/rosegarden.spec:1.38 packages/rosegarden/rosegarden.spec:1.39
--- packages/rosegarden/rosegarden.spec:1.38	Sun Feb  6 19:07:06 2011
+++ packages/rosegarden/rosegarden.spec	Thu Nov 24 18:47:31 2011
@@ -1,39 +1,39 @@
 # $Revision$, $Date$
-# TODO:
-#	- installed but unpackaged
-#	   /usr/share/apps/profiles/rosegarden.profile.xml
-#	   /usr/share/locale/en/LC_MESSAGES/rosegarden.mo
 #
 %define		_name		rosegarden
 #
 Summary:	Rosegarden - an attractive audio and MIDI sequencer
 Summary(pl.UTF-8):	Rosegarden - interaktywny sekwencer MIDI i audio
 Name:		rosegarden
-Version:	1.7.3
-Release:	5
-License:	GPL
+Version:	11.11.11
+Release:	0.1
+License:	GPL v2+
 Group:		X11/Applications/Sound
 Source0:	http://dl.sourceforge.net/rosegarden/%{_name}-%{version}.tar.bz2
-# Source0-md5:	122eab42e375d2f3b009c8540ae8069c
+# Source0-md5:	1e6529625b1e793288c3f1f8cdec955a
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-link_order.patch
-Patch2:		%{name}-dssi_lib64.patch
+Patch1:		%{name}-dssi_lib64.patch
 URL:		http://www.rosegardenmusic.com/
+BuildRequires:	QtCore-devel
+BuildRequires:	QtGui-devel
+BuildRequires:	QtNetwork-devel
+BuildRequires:	QtXml-devel
 BuildRequires:	alsa-lib-devel
 BuildRequires:	cmake
 BuildRequires:	dssi-devel >= 1.0.0
 BuildRequires:	fftw3-single-devel
 BuildRequires:	gettext-devel
 BuildRequires:	jack-audio-connection-kit-devel >= 0.80.0
-BuildRequires:	kde4-kde3support-devel >= 3.5.10-15
-BuildRequires:	kde4-kdelibs-devel
 BuildRequires:	ladspa-devel
 BuildRequires:	liblo-devel
+BuildRequires:	libsamplerate-devel
 BuildRequires:	liblrdf-devel
 BuildRequires:	lirc-devel
 BuildRequires:	pkgconfig >= 0.15
+BuildRequires:	qt4-build
+BuildRequires:	qt4-linguist
 BuildRequires:	rpmbuild(macros) >= 1.129
-Suggests:	kde4-kdebase-kdialog
+Requires(post,postun):	shared-mime-info
 Suggests:	libsndfile-progs
 Suggests:	lilypond
 Suggests:	perl-XML-Twig
@@ -52,48 +52,42 @@
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
-%patch1 -p1
 %if "%{_lib}" == "lib64"
-%patch2 -p1
+%patch1 -p1
 %endif
 
 %build
-export CMAKE_LIBRARY_PATH=%{_prefix}/lib/kde3dev
-export CMAKE_INCLUDE_PATH=%{_includedir}/kde3
-%cmake . \
-	-DWANT_LIRC=YES
-%{__make} -j1
+
+%configure
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -j1 install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_desktopdir}/kde
-
 rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
 
-%find_lang %{_name} --with-kde
+#%find_lang %{_name} --with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post
+%update_mime_database
+
+%postun
+%update_mime_database
 
-%files -f %{_name}.lang
+#%%files -f %{_name}.lang
+%files
 %defattr(644,root,root,755)
-%doc AUTHORS README TRANSLATORS
+%doc AUTHORS README
 %attr(755,root,root) %{_bindir}/rosegarden
-%attr(755,root,root) %{_bindir}/rosegarden-audiofile-importer
-%attr(755,root,root) %{_bindir}/rosegarden-lilypondview
-%attr(755,root,root) %{_bindir}/rosegarden-project-package
-%attr(755,root,root) %{_bindir}/rosegardensequencer
-%{_datadir}/apps/rosegarden
-%{_desktopdir}/kde/rosegarden.desktop
+%{_desktopdir}/rosegarden.desktop
 %{_iconsdir}/[!l]*/*/*/*.png
-%{_datadir}/mimelnk/audio/x-*.desktop
+%{_datadir}/mime/packages/*.xml
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -101,6 +95,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2011/11/24 17:47:31  jajcus
+- Version: 11.11.11 („The current stable, but experimental release”). No KDE3
+  and Qt3 dependency any more
+
 Revision 1.38  2011/02/06 18:07:06  sparky
 - don't mess with _smp_mflags
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rosegarden/rosegarden-desktop.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rosegarden/rosegarden.spec?r1=1.38&r2=1.39&f=u

