rpms/solfege/F-13 solfege-3.14.11-default-timidity.patch, NONE, 1.1 solfege-3.14.11-search-path.patch, NONE, 1.1 solfege.spec, 1.24, 1.25 solfege-3.14.1-no-x.patch, 1.1, NONE solfege-3.14.10-default_config.patch, 1.1, NONE

[chkr]

Author: chkr

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

Modified Files:
	solfege.spec 
Added Files:
	solfege-3.14.11-default-timidity.patch 
	solfege-3.14.11-search-path.patch 
Removed Files:
	solfege-3.14.1-no-x.patch solfege-3.14.10-default_config.patch 
Log Message:
* Sun Mar 07 2010 Christian Krause <chkr at fedoraproject.org> - 3.14.11-1
- Update to new upstream release
- Remove upstreamed patch
- Use timitidy as default
- Add patch to remove /usr/bin from python's search path to avoid crash
  on startup if package mpich2 is installed


solfege-3.14.11-default-timidity.patch:
 default.config |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE solfege-3.14.11-default-timidity.patch ---
diff -uNr solfege-3.14.11.old/default.config solfege-3.14.11/default.config
--- solfege-3.14.11.old/default.config	2010-02-08 11:55:13.000000000 +0100
+++ solfege-3.14.11/default.config	2010-02-20 16:29:44.000000000 +0100
@@ -65,7 +65,7 @@
 mma=mma
 
 [sound]
-type=sequencer-device
+type=external-midiplayer
 device_file=/dev/sequencer2
 synth_number=2
 wav_player=/usr/bin/aplay

solfege-3.14.11-search-path.patch:
 run-solfege.py.in |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE solfege-3.14.11-search-path.patch ---
diff -uNr solfege-3.14.11.old/run-solfege.py.in solfege-3.14.11/run-solfege.py.in
--- solfege-3.14.11.old/run-solfege.py.in	2010-02-08 11:55:13.000000000 +0100
+++ solfege-3.14.11/run-solfege.py.in	2010-03-07 21:13:20.000000000 +0100
@@ -32,6 +32,10 @@
 sys.path.insert(1, os.path.join(prefix, "lib", "solfege"))
 sys.path.insert(1, os.path.join(prefix, "share", "solfege"))
 
+# don't use sys.path[0] which is either the directory containing the script
+# or the empty string which makes python to look into the current directory
+sys.path.pop(0)
+
 import src
 import src.cfg
 from src import filesystem


Index: solfege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-13/solfege.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- solfege.spec	7 Feb 2010 20:43:46 -0000	1.24
+++ solfege.spec	7 Mar 2010 21:44:20 -0000	1.25
@@ -1,5 +1,5 @@
 Name:		solfege
-Version:	3.14.10
+Version:	3.14.11
 Release:	1%{?dist}
 Summary:	Music education software
 
@@ -7,17 +7,19 @@ Group:		Applications/Multimedia
 License:	GPLv3
 URL:		http://www.solfege.org/
 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
-# fix default config
-Patch2:		solfege-3.14.10-default_config.patch
+# use timidity as default
+Patch2:		solfege-3.14.11-default-timidity.patch
+# remove /usr/bin from the python search path to avoid a
+# collision with /usr/bin/mpd.py (from mpich2 package)
+Patch3:		solfege-3.14.11-search-path.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, txt2man
 BuildRequires:	desktop-file-utils, gettext
 
 Requires:	timidity++
@@ -32,6 +34,7 @@ interval, scale and chord skills. Solfeg
 %setup -q
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 
 #preserve timestamps
 %{__sed} -i.stamp -e 's|shutil\.copy|shutil.copy2|' tools/pcopy.py
@@ -49,8 +52,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%{__mkdir} $RPM_BUILD_ROOT%{_libexecdir}
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/solfege $RPM_BUILD_ROOT%{_libexecdir}/solfege-bin
+
 #permissions
 %{__chmod} 755 $RPM_BUILD_ROOT%{_libdir}/solfege/*.so
 
@@ -61,9 +63,6 @@ for f in AUTHORS README ; do
 		%{__rm} -f ${f}.tmp
 done
 
-#Setup wrapper script
-%{__install} -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/solfege
-
 %find_lang %{name}
 
 desktop-file-install --vendor fedora --delete-original \
@@ -80,7 +79,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc README AUTHORS COPYING
 %config(noreplace) %{_sysconfdir}/*
 %{_bindir}/*
-%{_libexecdir}/*
 %{_libdir}/solfege
 %{_datadir}/solfege/
 %{_datadir}/applications/*
@@ -89,6 +87,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 07 2010 Christian Krause <chkr at fedoraproject.org> - 3.14.11-1
+- Update to new upstream release
+- Remove upstreamed patch
+- Use timitidy as default
+- Add patch to remove /usr/bin from python's search path to avoid crash
+  on startup if package mpich2 is installed
+
 * Sun Feb 07 2010 Christian Krause <chkr at fedoraproject.org> - 3.14.10-1
 - Update to new upstream release
 - Some spec file cleanup


--- solfege-3.14.1-no-x.patch DELETED ---


--- solfege-3.14.10-default_config.patch DELETED ---