rpms/csound/devel csound-fixpython.patch, NONE, 1.1 csound.spec, 1.30, 1.31

[Peter Robinson]

Author: pbrobinson

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

Modified Files:
	csound.spec 
Added Files:
	csound-fixpython.patch 
Log Message:
- Further python build fixes

csound-fixpython.patch:
 install.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE csound-fixpython.patch ---
--- Csound5.10.1/install.py.orig	2009-08-18 09:58:32.000000000 +0100
+++ Csound5.10.1/install.py	2009-08-18 09:59:39.000000000 +0100
@@ -269,9 +269,6 @@
             err = installLink(i, concatPath([libDir, 'libcsound.so']))
         elif i[:15] == 'libcsound64.so.':
             err = installLink(i, concatPath([libDir, 'libcsound64.so']))
-        elif i == 'libcsnd.so':
-            err = installLink(concatPath([libDir, i]),
-                              concatPath([pythonDir2, '_csnd.so']))
         elif i == 'lib_CsoundVST.so':
             err = installLink(concatPath([libDir, i]),
                               concatPath([pythonDir2, '_CsoundVST.so']))
@@ -287,7 +284,7 @@
 #err = installFile('opcodes.dir', pluginDir)
 installErrors = installErrors or err
 pluginList = findFiles('.', 'lib[A-Za-z].*\\.so')
-for i in ['libcsound.so', 'libcsound64.so']:
+for i in ['libcsound.so', 'libcsound64.so', 'libcsnd.so']:
     if i in pluginList:
         pluginList.remove(i)
 for i in pluginList:
@@ -304,6 +301,7 @@
 
 print ' === Installing language interfaces ==='
 wrapperList = [['csnd\\.py', '0', pythonDir],
+               ['_csnd\\.so', '1', pythonDir],
                ['loris\\.py', '0', pythonDir],
                ['CsoundVST\\.py', '0', pythonDir],
                ['scoregen\\.py', '0', pythonDir],


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/devel/csound.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- csound.spec	24 Jul 2009 19:44:17 -0000	1.30
+++ csound.spec	18 Aug 2009 15:37:52 -0000	1.31
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       10%{?dist}
+Release:       11%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -23,7 +23,7 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 BuildRequires: swig scons libsndfile-devel libpng-devel libjpeg-devel
 BuildRequires: python python-devel
 BuildRequires: alsa-lib-devel jack-audio-connection-kit-devel pulseaudio-libs-devel
-BuildRequires: fluidsynth-devel liblo-devel dssi-devel
+BuildRequires: fluidsynth-devel liblo-devel dssi-devel lua-devel
 BuildRequires: fltk-devel fltk-fluid
 BuildRequires: java-devel >= 1.4.0
 BuildRequires: jpackage-utils >= 1.5
@@ -49,6 +49,7 @@ Patch6: csound-5.10.1-fix-conflicts.patc
 Patch7: csound-5.10.1-fix-locale-install.patch
 Patch8: csound-5.10.1-enable-oggplay.patch
 Patch9: csound-2817271-soname.patch
+Patch0: csound-fixpython.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -182,6 +183,7 @@ Canonical Reference Manual for Csound.
 
 %prep
 %setup -q -n Csound5.10.1
+%patch0 -p1 -b .fixpython
 %patch1 -p1 -b .no-usr-local
 %patch2 -p1 -b .default-opcodedir
 %patch3 -p1 -b .rtalsa
@@ -218,7 +220,10 @@ scons dynamicCsoundLibrary=1 \
       useFluidsynth=1 \
       generatePdf=0 \
       buildCsound5GUI=1 \
+      pythonVersion=2.6 \
       buildPythonOpcodes=1 \
+      buildPythonWrapper=1 \
+      buildLuaWrapper=1 \
       buildTclcsound=1 \
       buildJavaWrapper=1 \
       buildDSSI=1 \
@@ -311,7 +316,7 @@ fi
 %{_libdir}/%{name}/plugins/libbarmodel.so
 %{_libdir}/%{name}/plugins/libcompress.so
 %{_libdir}/%{name}/plugins/libcontrol.so
-%{_libdir}/%{name}/plugins/libcsnd.so
+%{_libdir}/%{name}/plugins/libchua.so
 %{_libdir}/%{name}/plugins/libcs_date.so
 %{_libdir}/%{name}/plugins/libcs_pan2.so
 %{_libdir}/%{name}/plugins/libcs_pvs_ops.so
@@ -358,10 +363,10 @@ fi
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/
 %{_libdir}/lib%{name}.so
-%{_libdir}/libcsnd.so
 
 %files python
 %defattr(-,root,root,-)
+%{_libdir}/libcsnd.so
 %{_libdir}/python%{pyver}/site-packages/*
 
 %files java
@@ -421,6 +426,9 @@ fi
 %doc manual/examples
 
 %changelog
+* Tue Aug 18 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-12
+- Further python build fixes
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.10.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild