rpms/canorus/devel .cvsignore, 1.2, 1.3 canorus.spec, 1.1, 1.2 sources, 1.2, 1.3

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/canorus/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1689

Modified Files:
	.cvsignore canorus.spec sources 
Log Message:
* Sun May 30 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-5.R1213.20100530svn
- SVN revision 1213



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	22 Sep 2009 18:10:38 -0000	1.2
+++ .cvsignore	31 May 2010 00:47:54 -0000	1.3
@@ -1 +1 @@
-canorus_0.7svn.R1177_source-FE.tar.bz2
+canorus_0.7svn.R1213_source-FE.tar.bz2


Index: canorus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/devel/canorus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- canorus.spec	22 Sep 2009 18:10:38 -0000	1.1
+++ canorus.spec	31 May 2010 00:47:54 -0000	1.2
@@ -1,11 +1,14 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%global svnrev R1177
-%global svndate .20090904svn
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
+%global svnrev R1213
+%global svndate .20100530svn
 
 Name:          canorus
 Summary:       Music Score Editor
 Version:       0.7
-Release:       4.%{svnrev}%{svndate}%{?dist}
+Release:       5.%{svnrev}%{svndate}%{?dist}
 Group:         Applications/Editors
 # rtmidi is MIT. It gets compiled into the final binary, which is GPLv2
 # The rest of the source code, as explicitly indicated by upstream, is GPLv2
@@ -14,12 +17,11 @@ License:       GPLv2 and Public Domain
 URL:           http://canorus.berlios.de/
 # The original source tarball contains content files that have
 # unknown and possibly nonfree licenses we remove those bits from the tarball.
-# wget http://193.95.242.3/canorusNightly/source/canorus_0.7svn.R1177_source.tar.bz2
-# tar jxf canorus_*.tar.bz2
+# svn export http://svn.berlios.de/svnroot/repos/canorus/trunk canorus-0.7
 # rm -fr canorus-*/examples/{midi,musicxml}
 ## This next one is non-commercial use only. So remove...
 # rm -fr canorus-*/examples/come_again.can
-# tar jcf canorus_0.7svn.R1177_source-FE.tar.bz2 canorus-*
+# tar jcf canorus_0.7svn.R1213_source-FE.tar.bz2 canorus-*
 Source0:       canorus_%{version}svn.%{svnrev}_source-FE.tar.bz2
 # The following patches are Fedora specific and not sent upstream:
 # Remove duplicate copies of docs that are already going to %%doc
@@ -64,7 +66,7 @@ more! Using a Qt4 framework Canorus offe
 cross-platformability.
 
 %prep
-%setup -q -n %{name}-%{version}svn.%{svnrev}
+%setup -q
 %patch0 -p1 -b .noextradocs
 %patch1 -p1 -b .fonts
 %patch2 -p1 -b .python
@@ -170,6 +172,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun May 30 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-5.R1213.20100530svn
+- SVN revision 1213
+
 * Fri Sep 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.7-4.R1177.20090904svn
 - SVN revision 1177 (how come is this different from the last snapshot?)
 - Fix compilation flags


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/canorus/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	22 Sep 2009 18:10:38 -0000	1.2
+++ sources	31 May 2010 00:47:54 -0000	1.3
@@ -1 +1 @@
-8d375719c70345a563aa8ca51a31920d  canorus_0.7svn.R1177_source-FE.tar.bz2
+fb24a2280de0c010d31e4a5689a0bbd1  canorus_0.7svn.R1213_source-FE.tar.bz2