rpms/olpcsound/devel olpcsound-py26.patch, NONE, 1.1 olpcsound.spec, 1.6, 1.7

[Peter Robinson]

Author: pbrobinson

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

Modified Files:
	olpcsound.spec 
Added Files:
	olpcsound-py26.patch 
Log Message:
- Fix python 2.6 build finally


olpcsound-py26.patch:

--- NEW FILE olpcsound-py26.patch ---
--- SConstruct.orig	2009-01-03 07:19:35.000000000 +0100
+++ SConstruct	2009-01-03 07:20:02.000000000 +0100
@@ -329,7 +329,7 @@
 commonEnvironment.Prepend(SWIGFLAGS = customSWIGFLAGS)
 
 if commonEnvironment['buildOLPC'] == '1':
-    commonEnvironment['pythonVersion'] = '2.5'
+    commonEnvironment['pythonVersion'] = '2.6'
     buildOLPC = True;
     commonEnvironment.Prepend(CPPFLAGS = ['-DOLPC'])
     commonEnvironment.Prepend(CPPFLAGS = ['-DENABLE_OPCODEDIR_WARNINGS=0'])
--- SConstruct2.orig	2009-01-03 07:19:39.000000000 +0100
+++ SConstruct2	2009-01-03 07:20:14.000000000 +0100
@@ -148,7 +148,7 @@
 
     def fixEnvForOLPC(self, env):
         if env['buildOLPC'] == '1':
-            env['pythonVersion']    = '2.5'
+            env['pythonVersion']    = '2.6'
             env.Prepend(CPPFLAGS    = ['-DOLPC'])
             env.Prepend(CPPFLAGS    = ['-DENABLE_OPCODEDIR_WARNINGS=0'])
 


Index: olpcsound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpcsound/devel/olpcsound.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- olpcsound.spec	3 Jan 2009 05:49:49 -0000	1.6
+++ olpcsound.spec	3 Jan 2009 06:49:13 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Csound - sound synthesis language and library, OLPC subset
 Name:   olpcsound        
 Version: 5.08.92
-Release: 14%{?dist}
+Release: 15%{?dist}
 URL: http://csound.sourceforge.net/
 License: LGPLv2+
 Group: Applications/Multimedia
@@ -12,6 +12,7 @@
 Patch3: sfont-envelope.patch
 Patch4: jack-pulseaudio.patch
 Patch5: rtalsa-sched.patch
+Patch6: olpcsound-py26.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: swig python scons alsa-lib-devel liblo-devel libsndfile-devel 
 BuildRequires: jack-audio-connection-kit-devel 
@@ -40,6 +41,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p0 -b .py26
 
 %build
 %{_bindir}/scons buildOLPC=1 customCCFLAGS="%{optflags}" customCXXFLAGS="%{optflags}"
@@ -78,6 +80,9 @@
 
 
 %changelog
+* Sat Jan  3 2009 Peter Robinson <pbrobinson at gmail.com> - 5.08.92-15
+- Add patch for python 2.6 versions
+
 * Sat Jan  3 2009 Peter Robinson <pbrobinson at gmail.com> - 5.08.92-14
 - Hopefully fix versioned python dir locations