rpms/solfege/F-13 .cvsignore, 1.11, 1.12 solfege.spec, 1.25, 1.26 sources, 1.11, 1.12 solfege-3.14.11-search-path.patch, 1.1, NONE

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/solfege/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17676

Modified Files:
	.cvsignore solfege.spec sources 
Removed Files:
	solfege-3.14.11-search-path.patch 
Log Message:
* Fri Apr 02 2010 Christian Krause <chkr at fedoraproject.org> - 3.16.0-1
- Update to new upstream release
- Remove patch to fix python's search path, solfege uses absolute
  imports now



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-13/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	7 Mar 2010 21:50:34 -0000	1.11
+++ .cvsignore	2 Apr 2010 22:17:32 -0000	1.12
@@ -1 +1 @@
-solfege-3.14.11.tar.gz
+solfege-3.16.0.tar.gz


Index: solfege.spec
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-13/solfege.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- solfege.spec	7 Mar 2010 21:44:20 -0000	1.25
+++ solfege.spec	2 Apr 2010 22:17:32 -0000	1.26
@@ -1,5 +1,5 @@
 Name:		solfege
-Version:	3.14.11
+Version:	3.16.0
 Release:	1%{?dist}
 Summary:	Music education software
 
@@ -11,10 +11,6 @@ Source0:	http://downloads.sourceforge.ne
 Patch1:		solfege-3.14.1-desktop.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 
@@ -33,15 +29,11 @@ interval, scale and chord skills. Solfeg
 %prep
 %setup -q
 %patch1 -p0
-%patch2 -p1
-%patch3 -p1
+%patch2 -F 1 -p1
 
 #preserve timestamps
 %{__sed} -i.stamp -e 's|shutil\.copy|shutil.copy2|' tools/pcopy.py
 
-#fix permissios for debuginfo package
-chmod 0755 $RPM_BUILD_DIR/%{name}-%{version}/src/_version.py
-
 %build
 export INSTALL="%{__install} -c -p"
 #override hardocded path
@@ -55,6 +47,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 #permissions
 %{__chmod} 755 $RPM_BUILD_ROOT%{_libdir}/solfege/*.so
+%{__chmod} 755 $RPM_BUILD_ROOT%{_datadir}/solfege/solfege/_version.py
 
 #Change encoding to UTF-8
 for f in AUTHORS README ; do
@@ -87,6 +80,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 02 2010 Christian Krause <chkr at fedoraproject.org> - 3.16.0-1
+- Update to new upstream release
+- Remove patch to fix python's search path, solfege uses absolute
+  imports now
+
 * Sun Mar 07 2010 Christian Krause <chkr at fedoraproject.org> - 3.14.11-1
 - Update to new upstream release
 - Remove upstreamed patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/solfege/F-13/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	7 Mar 2010 21:50:34 -0000	1.11
+++ sources	2 Apr 2010 22:17:32 -0000	1.12
@@ -1 +1 @@
-14bd39762081eb0d02b69706db348861  solfege-3.14.11.tar.gz
+ce60c0e8ba5fdd6c34046964e25c783a  solfege-3.16.0.tar.gz


--- solfege-3.14.11-search-path.patch DELETED ---