rpms/octave-forge/devel octave-forge-20090607-parallel-build.patch, NONE, 1.1 octave-forge.spec, 1.73, 1.74

[alexlan]

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7875

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20090607-parallel-build.patch 
Log Message:
* Wed Aug 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-4
- Add patch from SVN upstream (r6116) to fix build of parallel package
  (bump version of package to 2.0.1)


octave-forge-20090607-parallel-build.patch:
 DESCRIPTION    |    4 ++--
 src/pserver.cc |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE octave-forge-20090607-parallel-build.patch ---
--- main/parallel-2.0.0/src/pserver.cc	2009/08/19 05:01:22	6115
+++ main/parallel-2.0.0/src/pserver.cc	2009/08/19 08:30:19	6116
@@ -61,8 +61,6 @@
 // SSIZE_MAX might be for 64-bit. Limit to 2^31-1
 #define BUFF_SIZE 2147483647
 
-static bool quitting_gracefully = false;
-
 // Handle server SIGTERM SIGQUIT
 
 static RETSIGTYPE
@@ -99,6 +97,7 @@
 do_octave_atexit_server (void)
 {
   static bool deja_vu = false;
+  extern bool quitting_gracefully;
 
   while (! octave_atexit_functions.empty ())
     {
--- main/parallel-2.0.0/DESCRIPTION	2009/08/19 05:01:22	6115
+++ main/parallel-2.0.0/DESCRIPTION	2009/08/19 08:30:19	6116
@@ -1,6 +1,6 @@
 Name: Parallel
-Version: 2.0.0
-Date: 2009-03-29
+Version: 2.0.1
+Date: 2009-08-19
 Author: Hayato Fujiwara and Olaf Till <olaf.till at uni-jena.de>
 Maintainer: Hayato Fujiwara and Olaf Till <olaf.till at uni-jena.de>
 Title: Parallel Computing.


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- octave-forge.spec	18 Aug 2009 23:44:45 -0000	1.73
+++ octave-forge.spec	20 Aug 2009 02:23:00 -0000	1.74
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -20,6 +20,7 @@ Source0:        %{name}-bundle-%{version
 #Patch0:         %{name}-image-1.0.8-build.patch
 Patch0:		octave-forge-20090607-includes.patch
 Patch1:		octave-forge-20090607-ann-swig-build.patch
+Patch2:		octave-forge-20090607-parallel-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -64,7 +65,7 @@ Provides: octave-odepkg = 0.6.7
 Provides: octave-optim = 1.0.6
 Provides: octave-optiminterp = 0.3.2
 Provides: octave-outliers = 0.13.9
-Provides: octave-parallel = 2.0.0
+Provides: octave-parallel = 2.0.1
 Provides: octave-physicalconstants = 0.1.7
 Provides: octave-plot = 1.0.7
 Provides: octave-quaternion = 1.0.0
@@ -158,6 +159,7 @@ done
 #apply patches
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -231,6 +233,10 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Wed Aug 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-4
+- Add patch from SVN upstream (r6116) to fix build of parallel package
+  (bump version of package to 2.0.1)
+
 * Tue Aug 18 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-3
 - Temporarily remove ftp because of build problems with SWIG upstream.