rpms/octave-forge/devel octave-forge-20090607-includes.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 octave-forge.spec, 1.70, 1.71 sources, 1.14, 1.15

alexlan alexlan at fedoraproject.org
Sat Aug 1 03:13:26 UTC 2009


Author: alexlan

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

Modified Files:
	.cvsignore octave-forge.spec sources 
Added Files:
	octave-forge-20090607-includes.patch 
Log Message:
* Fri Jul 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-1
- Apply patch from Jussi Lehtola <jussilehtola at fedoraproject.org> to
  update to 20090607


octave-forge-20090607-includes.patch:
 pserver.cc |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE octave-forge-20090607-includes.patch ---
diff -up main/parallel-2.0.0/src/pserver.cc.orig main/parallel-2.0.0/src/pserver.cc
--- main/parallel-2.0.0/src/pserver.cc.orig	2009-05-08 16:17:57.000000000 +0300
+++ main/parallel-2.0.0/src/pserver.cc	2009-07-11 15:52:31.345823807 +0300
@@ -44,6 +44,7 @@ along with this program; If not, see <ht
 #include "input.h"
 #include "quit.h"
 
+#include <iostream>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	9 Sep 2008 17:59:42 -0000	1.14
+++ .cvsignore	1 Aug 2009 03:13:25 -0000	1.15
@@ -1 +1 @@
-octave-forge-bundle-20080831.patched.tar.gz
+octave-forge-bundle-20090607.patched.tar.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- octave-forge.spec	25 Jul 2009 20:33:55 -0000	1.70
+++ octave-forge.spec	1 Aug 2009 03:13:26 -0000	1.71
@@ -1,8 +1,8 @@
 %{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
 
 Name:           octave-forge
-Version:        20080831
-Release:        10%{?dist}
+Version:        20090607
+Release:        1%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,82 +17,101 @@ URL:            http://octave.sourceforg
 ## tar czf octave-forge-bundle-%{version}.patched.tar.gz octave-forge-bundle-%{version}
 ## rm -Rf octave-forge-bundle-%{version}
 Source0:        %{name}-bundle-%{version}.patched.tar.gz
-Patch0:         %{name}-image-1.0.8-build.patch
+#Patch0:         %{name}-image-1.0.8-build.patch
+Patch0:		octave-forge-20090607-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave(api) = %{octave_api} ImageMagick
 BuildRequires:  octave-devel >= 6:3.0.0-1
 BuildRequires:  tetex gcc-gfortran ginac-devel
 BuildRequires:  ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel ftplib-devel
 BuildRequires:  openssl-devel java-devel-gcj
-Provides: octave-ann = 1.0.1
-Provides: octave-audio = 1.1.2
-Provides: octave-benchmark = 1.0.0
-Provides: octave-bioinfo = 0.1.1
-Provides: octave-combinatorics = 1.0.7
-Provides: octave-communications = 1.0.8
-Provides: octave-control = 1.0.7
-Provides: octave-data-smoothing = 1.1.1
-Provides: octave-econometrics = 1.0.7
-Provides: octave-financial = 0.3.0
-Provides: octave-fixed = 0.7.8
-Provides: octave-ftp = 1.0.1
-Provides: octave-ga = 0.9.4
-Provides: octave-general = 1.0.7
-Provides: octave-gsl = 1.0.7
-Provides: octave-ident = 1.0.6
-Provides: octave-image = 1.0.8
-Provides: octave-informationtheory = 0.1.6
-Provides: octave-io = 1.0.7
-Provides: octave-irsa = 1.0.6
-Provides: octave-linear-algebra = 1.0.6
-Provides: octave-miscellaneous = 1.0.7
-Provides: octave-missing-functions = 1.0.1
-Provides: octave-nnet = 0.1.8
-Provides: octave-octcdf = 1.0.11
-Provides: octave-octgpr = 1.1.4
-Provides: octave-odebvp = 1.0.5
-Provides: octave-odepkg = 0.6.4
-Provides: octave-optim = 1.0.4
-Provides: octave-optiminterp = 0.3.1
-Provides: octave-outliers = 0.13.8
-Provides: octave-parallel = 1.0.7
-Provides: octave-physicalconstants = 0.1.6
-Provides: octave-plot = 1.0.6
-Provides: octave-signal = 1.0.8
+
+Requires:	octave(api) = %{octave_api} ImageMagick
+
+# Main
+Provides: octave-ann = 1.0.2
+Provides: octave-audio = 1.1.4
+Provides: octave-benchmark = 1.1.1
+Provides: octave-bioinfo = 0.1.2
+Provides: octave-combinatorics = 1.0.9
+Provides: octave-communications = 1.0.10
+Provides: octave-control = 1.0.11
+# octave-database is removed
+Provides: octave-data-smoothing = 1.2.0
+Provides: octave-econometrics = 1.0.8
+Provides: octave-financial = 0.3.2
+Provides: octave-fixed = 0.7.10
+Provides: octave-ftp = 1.0.2
+Provides: octave-ga = 0.9.7
+Provides: octave-general = 1.1.3
+Provides: octave-gsl = 1.0.8
+Provides: octave-ident = 1.0.7
+Provides: octave-image = 1.0.10
+Provides: octave-informationtheory = 0.1.8
+Provides: octave-io = 1.0.9
+Provides: octave-irsa = 1.0.7
+Provides: octave-linear-algebra = 1.0.8
+Provides: octave-miscellaneous = 1.0.9
+Provides: octave-missing-functions = 1.0.2
+Provides: octave-nnet = 0.1.10
+Provides: octave-octcdf = 1.0.13
+Provides: octave-octgpr = 1.1.5
+Provides: octave-odebvp = 1.0.6
+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-physicalconstants = 0.1.7
+Provides: octave-plot = 1.0.7
+Provides: octave-quaternion = 1.0.0
+Provides: octave-signal = 1.0.10
+Provides: octave-simp = 1.1.0
 Provides: octave-sockets = 1.0.5
-Provides: octave-specfun = 1.0.7
-Provides: octave-special-matrix = 1.0.6
-Provides: octave-splines = 1.0.6
-Provides: octave-statistics = 1.0.7
-Provides: octave-strings = 1.0.6
-Provides: octave-struct = 1.0.6
-Provides: octave-symbolic = 1.0.7
-Provides: octave-time = 1.0.8
-Provides: octave-vrml = 1.0.8
-Provides: octave-zenity = 0.5.6
-Provides: octave-ad = 1.0.4
-Provides: octave-bim = 0.0.7
-Provides: octave-civil-engineering = 1.0.6
-Provides: octave-fpl = 0.1.3
-Provides: octave-graceplot = 1.0.6
-Provides: octave-integration = 1.0.6
-Provides: octave-java = 1.2.5
-Provides: octave-mapping = 1.0.6
-Provides: octave-msh = 0.0.7
-Provides: octave-multicore = 0.2.13
-Provides: octave-nan = 1.0.7
-Provides: octave-nlwing2 = 1.0.1
-Provides: octave-ocs = 0.0.2
-Provides: octave-pdb = 1.0.6
-Provides: octave-secs1d = 0.0.7
-Provides: octave-secs2d = 0.0.7
-Provides: octave-symband = 1.0.8
-Provides: octave-tcl-octave = 0.1.7
-Provides: octave-tsa = 4.0.0
-Provides: octave-xraylib = 1.0.7
-Provides: octave-pt_br = 1.0.7
+Provides: octave-specfun = 1.0.8
+Provides: octave-special-matrix = 1.0.7
+Provides: octave-splines = 1.0.7
+Provides: octave-statistics = 1.0.9
+Provides: octave-strings = 1.0.7
+Provides: octave-struct = 1.0.7
+Provides: octave-symbolic = 1.0.9
+Provides: octave-time = 1.0.9
+# octave-video is removed
+Provides: octave-vrml = 1.0.10
+Provides: octave-zenity = 0.5.7
+
+# Extra
+Provides: octave-ad = 1.0.6
+Provides: octave-bim = 0.1.1
+Provides: octave-civil-engineering = 1.0.7
+# octave-engine is removed
+Provides: octave-fpl = 0.1.6
+Provides: octave-generate_html = 0.0.9
+Provides: octave-graceplot = 1.0.8
+Provides: octave-integration = 1.0.7
+Provides: octave-java = 1.2.6
+# octave-jhandles is removed
+Provides: octave-mapping = 1.0.7
+Provides: octave-msh = 0.1.1
+Provides: octave-multicore = 0.2.15
+Provides: octave-nan = 1.0.9
+Provides: octave-nlwing2 = 1.1.1
+Provides: octave-nurbs = 1.0.1
+Provides: octave-ocs = 0.0.4
+Provides: octave-oct2mat = 1.0.7
+Provides: octave-pdb = 1.0.7
+Provides: octave-secs1d = 0.0.8
+Provides: octave-secs2d = 0.0.8
+Provides: octave-symband = 1.0.10
+Provides: octave-tcl-octave = 0.1.8
+Provides: octave-tsa = 4.0.1
+# octave-windows is removed
+Provides: octave-xraylib = 1.0.8
+
+# Language
+Provides: octave-spanish = 1.0.1
+Provides: octave-pt_br = 1.0.8
 
 
 %description
@@ -118,6 +137,7 @@ rm extra/windows-*.tar.gz
 # 5. exclude database stuff--it should be in its own package
 rm main/database-*.tar.gz
 
+
 #Unpack everything
 for pkg in main extra language
 do
@@ -207,6 +227,10 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Fri Jul 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-1
+- Apply patch from Jussi Lehtola <jussilehtola at fedoraproject.org> to
+  update to 20090607
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20080831-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	9 Sep 2008 17:59:42 -0000	1.14
+++ sources	1 Aug 2009 03:13:26 -0000	1.15
@@ -1 +1 @@
-5df8ff572c9b990e404ba94a6724c898  octave-forge-bundle-20080831.patched.tar.gz
+ae1c9fd282e66e6e1bee2535963e6d6e  octave-forge-bundle-20090607.patched.tar.gz




More information about the fedora-extras-commits mailing list