rpms/rosegarden4/devel rosegarden4.spec,1.11,1.12

[Orcan Ogetbil]

Author: oget

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

Modified Files:
	rosegarden4.spec 
Log Message:
* Sat Mar 07 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.7.3-2
- Add Requires: perl-XML-Twig. RHBZ#468919
- Fix the lilypondview script. RHBZ#464046
- Separate fonts to their own subpackages RHBZ#477450



Index: rosegarden4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rosegarden4/devel/rosegarden4.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rosegarden4.spec	6 Mar 2009 23:47:30 -0000	1.11
+++ rosegarden4.spec	7 Mar 2009 08:01:10 -0000	1.12
@@ -1,6 +1,6 @@
 Name:      rosegarden4
 Version:   1.7.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   MIDI, audio and notation editor
 Group:     Applications/Multimedia
 License:   GPLv2+
@@ -21,6 +21,11 @@
 BuildRequires: liblrdf-devel
 BuildRequires: dssi-devel
 BuildRequires: lirc-devel
+BuildRequires: fontpackages-devel
+
+Requires: perl-XML-Twig
+Requires: %{name}-feta-fonts = %{version}-%{release}
+Requires: %{name}-parmesan-fonts = %{version}-%{release}
 
 %description
 Rosegarden is a professional audio and MIDI sequencer, score editor, and
@@ -29,6 +34,30 @@
 Rosegarden is an easy to learn, attractive application, ideal for composers,
 musicians, music students, and small studio or home recording environments. 
 
+%package feta-fonts
+Summary:  Rosegarden feta fonts
+Group:    User Interface/X
+Requires: fontpackages-filesystem
+
+%description feta-fonts
+Rosegarden is a professional audio and MIDI sequencer, score editor, and
+general purpose music composition and editing environment.
+
+This package contains Lilypond's feta musical notation fonts adapted for use
+of Rosegarden.
+
+%package parmesan-fonts
+Summary:  Rosegarden parmesan fonts
+Group:    User Interface/X
+Requires: fontpackages-filesystem
+
+%description parmesan-fonts
+Rosegarden is a professional audio and MIDI sequencer, score editor, and
+general purpose music composition and editing environment.
+
+This package contains Lilypond's parmesan musical notation fonts adapted for
+use of Rosegarden.
+
 %prep
 %setup -q -n rosegarden-%{version}
 # Look for LADSPA/DSSI plugins in the correct place on 64bit platforms 
@@ -42,6 +71,9 @@
 # Add GenericName to the desktop file:
 echo "GenericName=Audio and MIDI Sequencer" >> data/desktop/rosegarden.desktop
 
+# Put quotes around this item, otherwise the script will fail. RHBZ#464046
+sed -i 's|\(`send_dcop wasCancelled`\)|"\1"|' src/helpers/rosegarden-lilypondview
+
 %build
 %cmake . -DCMAKE_CXX_FLAGS="%{optflags}"
 make VERBOSE=1 %{?_smp_mflags}
@@ -62,6 +94,15 @@
 
 %find_lang rosegarden
 
+# Install fonts in the %%_fontdir and create symlinks
+mkdir -p %{buildroot}/%{_fontdir}
+install -pm 644 data/fonts/*.pfa %{buildroot}/%{_fontdir}
+pushd %{buildroot}%{_datadir}/apps/rosegarden/fonts/
+   for pfafile in *.pfa ; do
+      ln -sf ../../../fonts/%{name}/$pfafile .
+   done
+popd
+
 %check
 #ctest
 
@@ -113,7 +154,18 @@
 %{_datadir}/mimelnk/audio/x-rosegarden-device.desktop
 %{_datadir}/mimelnk/audio/x-soundfont.desktop
 
+%_font_pkg -n feta *feta*.pfa
+%doc data/fonts/README
+
+%_font_pkg -n parmesan *parmesan*.pfa
+%doc data/fonts/README
+
 %changelog
+* Sat Mar 07 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.7.3-2
+- Add Requires: perl-XML-Twig. RHBZ#468919
+- Fix the lilypondview script. RHBZ#464046
+- Separate fonts to their own subpackages RHBZ#477450
+
 * Fri Mar 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.7.3-1
 - New upstream version.