rpms/csound/devel csound-5.03.0-fltk-fixes.patch, NONE, 1.1 csound.spec, 1.10, 1.11

Thomas Fitzsimmons (fitzsim) fedora-extras-commits at redhat.com
Wed Apr 4 21:12:51 UTC 2007


Author: fitzsim

Update of /cvs/extras/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8468

Modified Files:
	csound.spec 
Added Files:
	csound-5.03.0-fltk-fixes.patch 
Log Message:
* Mon Apr  2 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 5.03.0-13
- Patch out FLTK widget initialization code made unnecessary by
  fltk-fluid 1.1.8, snapshot r5555
- Update python site-packages version to 2.5



csound-5.03.0-fltk-fixes.patch:

--- NEW FILE csound-5.03.0-fltk-fixes.patch ---
--- Csound5.03.0.orig/frontends/fltk_gui/CsoundGUIConsole_FLTK.fl	2006-06-03 12:29:13.000000000 -0400
+++ Csound5.03.0/frontends/fltk_gui/CsoundGUIConsole_FLTK.fl	2007-04-02 16:10:41.000000000 -0400
@@ -32,7 +32,6 @@
     Fl_Window window {
       label {Csound console messages} open
       xywh {438 150 585 320} type Double resizable
-      code0 {window = (Fl_Double_Window*) o;} visible
     } {
       Fl_Text_Display textDisplay {
         xywh {0 0 585 320} box DOWN_BOX color 255 labelsize 12 textfont 4 textsize 12 resizable
--- Csound5.03.0.orig/frontends/fltk_gui/CsoundPerformanceSettingsPanel_FLTK.fl	2006-06-03 12:29:13.000000000 -0400
+++ Csound5.03.0/frontends/fltk_gui/CsoundPerformanceSettingsPanel_FLTK.fl	2007-04-02 16:00:39.000000000 -0400
@@ -22,7 +22,6 @@
       label {Csound performance settings}
       callback {status = 1;} open
       xywh {331 173 390 450} type Double
-      code0 {window = o;} visible
     } {
       Fl_Tabs {} {open
         xywh {0 0 390 405}


Index: csound.spec
===================================================================
RCS file: /cvs/extras/rpms/csound/devel/csound.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- csound.spec	1 Apr 2007 15:33:01 -0000	1.10
+++ csound.spec	4 Apr 2007 21:12:17 -0000	1.11
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       12%{?dist}
+Release:       13%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -42,6 +42,7 @@
 Patch3: csound-5.03.0-disable-atsa.patch
 Patch4: csound-5.03.0-default-opcodedir.patch
 Patch5: csound-5.03.0-rtalsa-fix.patch
+Patch6: csound-5.03.0-fltk-fixes.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -186,6 +187,7 @@
 %patch3 -p1 -b .disable-atsa
 %patch4 -p1 -b .default-opcodedir
 %patch5 -p1 -b .rtalsa-fix
+%patch6 -p1 -b .fltk-fixes
 
 tar xf %{SOURCE1}
 
@@ -243,7 +245,7 @@
 # This file is zero-lenth for some reason
 %{__rm} -f manual/examples/ifthen.csd
 
-%{__mv} %{buildroot}%{_libdir}/lib_csnd.so %{buildroot}%{_libdir}/python2.4/site-packages/_csnd.so
+%{__mv} %{buildroot}%{_libdir}/lib_csnd.so %{buildroot}%{_libdir}/python2.5/site-packages/_csnd.so
 
 install -dm 755 %{buildroot}%{_javadir}
 (cd %{buildroot}%{_javadir}; ln -s %{_libdir}/%{name}/java/csnd.jar .)
@@ -340,7 +342,7 @@
 
 %files python
 %defattr(-,root,root,0755)
-%{_libdir}/python2.4/site-packages/*
+%{_libdir}/python2.5/site-packages/*
 
 %files java
 %{_libdir}/lib_jcsound.so
@@ -404,6 +406,11 @@
 %doc tutorial/*.py
 
 %changelog
+* Mon Apr  2 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 5.03.0-13
+- Patch out FLTK widget initialization code made unnecessary by
+  fltk-fluid 1.1.8, snapshot r5555
+- Update python site-packages version to 2.5
+
 * Sat Mar 31 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 5.03.0-12
 - Require java-1.5.0-gcj
 




More information about the scm-commits mailing list