rpms/csound/devel csound-fixpython.patch, 1.1, 1.2 csound.spec, 1.34, 1.35

[Peter Robinson]

Author: pbrobinson

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

Modified Files:
	csound-fixpython.patch csound.spec 
Log Message:
- Updated python patch thanks to dsd.

csound-fixpython.patch:
 install.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: csound-fixpython.patch
===================================================================
RCS file: /cvs/pkgs/rpms/csound/devel/csound-fixpython.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- csound-fixpython.patch	18 Aug 2009 15:37:52 -0000	1.1
+++ csound-fixpython.patch	3 Dec 2009 17:51:32 -0000	1.2
@@ -1,16 +1,29 @@
---- 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 @@
+Index: Csound5.10.1/install.py
+===================================================================
+--- Csound5.10.1.orig/install.py
++++ Csound5.10.1/install.py
+@@ -256,7 +256,7 @@ libList = findFiles('.', 'libcsound\\.a'
+ libList += findFiles('.', 'libcsound64\\.a')
+ libList += findFiles('.', 'libcsound\\.so\\..+')
+ libList += findFiles('.', 'libcsound64\\.so\\..+')
+-libList += findFiles('.', 'libcsnd\\.so')
++libList += findFiles('.', 'libcsnd\\.so\\..+')
+ libList += findFiles('.', 'lib_jcsound\\.so')
+ libList += findFiles('.', 'lib_CsoundVST\\.so')
+ for i in libList:
+@@ -269,9 +269,8 @@ for i in libList:
              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[:11] == 'libcsnd.so.':
++            err = installLink(i, concatPath([libDir, 'libcsnd.so']))
          elif i == 'lib_CsoundVST.so':
              err = installLink(concatPath([libDir, i]),
                                concatPath([pythonDir2, '_CsoundVST.so']))
-@@ -287,7 +284,7 @@
+@@ -287,7 +286,7 @@ else:
  #err = installFile('opcodes.dir', pluginDir)
  installErrors = installErrors or err
  pluginList = findFiles('.', 'lib[A-Za-z].*\\.so')
@@ -19,7 +32,7 @@
      if i in pluginList:
          pluginList.remove(i)
  for i in pluginList:
-@@ -304,6 +301,7 @@
+@@ -304,6 +303,7 @@ installErrors = installErrors or err
  
  print ' === Installing language interfaces ==='
  wrapperList = [['csnd\\.py', '0', pythonDir],


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/devel/csound.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- csound.spec	20 Oct 2009 13:23:07 -0000	1.34
+++ csound.spec	3 Dec 2009 17:51:32 -0000	1.35
@@ -14,7 +14,7 @@
 Summary:       A sound synthesis language and library
 Name:          csound
 Version:       5.10.1
-Release:       13%{?dist}
+Release:       14%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPLv2+
 Group:         Applications/Multimedia
@@ -81,6 +81,14 @@ Requires: python
 Contains Python language bindings for developing Python applications that
 use Csound.
 
+%package python-devel
+Summary: Csound python development files and libraries
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description python-devel
+Contains libraries for developing against csound-python.
+
 %package java
 Summary: Java Csound support
 Group: System Environment/Libraries
@@ -373,9 +381,13 @@ fi
 
 %files python
 %defattr(-,root,root,-)
-%{_libdir}/libcsnd.so
+%{_libdir}/libcsnd.so.5.2
 %{_libdir}/python%{pyver}/site-packages/*
 
+%files python-devel
+%defattr(-,root,root,-)
+%{_libdir}/libcsnd.so
+
 %files java
 %defattr(-,root,root,-)
 %{_libdir}/lib_jcsound.so
@@ -433,6 +445,9 @@ fi
 %doc manual/examples
 
 %changelog
+* Thu Dec  3 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-14
+- Updated python patch thanks to dsd.
+
 * Tue Oct 20 2009 Peter Robinson <pbrobinson at gmail.com> - 5.10.1-13
 - Fix use of multiple midi devices, fix segfault (RHBZ 529293)