rpms/solfege/F-11 solfege-3.14.10-default_config.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 solfege.spec, 1.22, 1.23 sources, 1.9, 1.10

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/solfege/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9846

Modified Files:
	.cvsignore solfege.spec sources 
Added Files:
	solfege-3.14.10-default_config.patch 
Log Message:
* Sun Feb 07 2010 Christian Krause <chkr at fedoraproject.org> - 3.14.10-1
- Update to new upstream release
- Some spec file cleanup
- Add minor patch to fix a problem with the default config (programs and
  their parameters are now stored in separate config entries)


solfege-3.14.10-default_config.patch:
 default.config |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE solfege-3.14.10-default_config.patch ---
diff -uNr solfege-3.14.10.old/default.config solfege-3.14.10/default.config
--- solfege-3.14.10.old/default.config	2009-12-17 20:19:02.000000000 +0100
+++ solfege-3.14.10/default.config	2010-02-07 21:16:38.000000000 +0100
@@ -69,7 +69,8 @@
 device_file=/dev/sequencer2
 synth_number=2
 wav_player=/usr/bin/aplay
-midi_player=/usr/bin/timidity -idqq %s
+midi_player=/usr/bin/timidity
+midi_player_options=-idqq %s
 mp3_player=/usr/bin/mpg123
 ogg_player=/usr/bin/ogg123
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 Apr 2009 17:09:19 -0000	1.9
+++ .cvsignore	7 Feb 2010 22:26:13 -0000	1.10
@@ -1 +1 @@
-solfege-3.14.2.tar.gz
+solfege-3.14.10.tar.gz


Index: solfege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-11/solfege.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- solfege.spec	13 Apr 2009 20:30:51 -0000	1.22
+++ solfege.spec	7 Feb 2010 22:26:13 -0000	1.23
@@ -1,25 +1,27 @@
 Name:		solfege
-Version:	3.14.2      
+Version:	3.14.10
 Release:	1%{?dist}
 Summary:	Music education software
 
 Group:		Applications/Multimedia
 License:	GPLv3
 URL:		http://www.solfege.org/
-Source0:	http://dl.sourceforge.net/solfege/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/solfege/%{name}-%{version}.tar.gz
 Source1:	solfege.sh.in
-#make sure desktop file is sane, don't use extension without path in Icon=
-Patch1:         solfege-3.14.1-desktop.patch
+# make sure desktop file is sane, don't use extension without path in Icon=
+Patch1:		solfege-3.14.1-desktop.patch
+# fix default config
+Patch2:		solfege-3.14.10-default_config.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	texinfo, swig, gettext, docbook-style-xsl 
 BuildRequires:	pygtk2-devel >= 2.12, libxslt
-BuildRequires:  swig
+BuildRequires:	swig
 BuildRequires:	desktop-file-utils, gettext
 
 Requires:	timidity++
-Requires:       gnome-python2-gtkhtml2, esound
+Requires:	gnome-python2-gtkhtml2, esound
 Requires:	pygtk2 >= 2.12
 
 %description
@@ -29,6 +31,7 @@ interval, scale and chord skills. Solfeg
 %prep
 %setup -q
 %patch1 -p0
+%patch2 -p1
 
 #preserve timestamps
 %{__sed} -i.stamp -e 's|shutil\.copy|shutil.copy2|' tools/pcopy.py
@@ -53,9 +56,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 #Change encoding to UTF-8
 for f in AUTHORS README ; do
-        iconv -f ISO-8859-15 -t UTF-8 $f > ${f}.tmp && \
-                %{__mv} -f ${f}.tmp ${f} || \
-                %{__rm} -f ${f}.tmp
+	iconv -f ISO-8859-15 -t UTF-8 $f > ${f}.tmp && \
+		%{__mv} -f ${f}.tmp ${f} || \
+		%{__rm} -f ${f}.tmp
 done
 
 #Setup wrapper script
@@ -63,10 +66,10 @@ done
 
 %find_lang %{name}
 
-desktop-file-install --vendor fedora --delete-original  \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --remove-category Application \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-install --vendor fedora --delete-original \
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+	--remove-category Application \
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,6 +89,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 07 2010 Christian Krause <chkr at fedoraproject.org> - 3.14.10-1
+- Update to new upstream release
+- Some spec file cleanup
+- Add minor patch to fix a problem with the default config (programs and
+  their parameters are now stored in separate config entries)
+
 * Mon Apr 13 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 3.14.2-1
 - New upstream release
 - No-X patch merged upstream, remove it.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	13 Apr 2009 17:09:20 -0000	1.9
+++ sources	7 Feb 2010 22:26:13 -0000	1.10
@@ -1 +1 @@
-d3b342867f8f7d7e8768bd81656559f4  solfege-3.14.2.tar.gz
+d24ab1184ee1466fba9c965cb8ae8f58  solfege-3.14.10.tar.gz