rpms/octave-forge/F-9 octave-forge-20080429-gcc43.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 octave-forge.spec, 1.53, 1.54 sources, 1.11, 1.12
Quentin Spencer (qspencer)
fedora-extras-commits at redhat.com
Fri May 2 15:59:42 UTC 2008
- Previous message: fedora-release fedora-release.spec,1.58.2.2,1.58.2.3
- Next message: rpms/system-config-printer/F-9 system-config-printer-authconn.patch, NONE, 1.1 system-config-printer.spec, 1.178, 1.179 system-config-printer.console, 1.2, NONE system-config-printer.pam, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: qspencer
Update of /cvs/extras/rpms/octave-forge/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20310
Modified Files:
.cvsignore octave-forge.spec sources
Added Files:
octave-forge-20080429-gcc43.patch
Log Message:
New upstream release with most of the rawhide changes.
octave-forge-20080429-gcc43.patch:
--- NEW FILE octave-forge-20080429-gcc43.patch ---
diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp
--- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp 2008-04-28 12:08:50.000000000 -0500
+++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/ann2fig/ann2fig.cpp 2008-05-01 12:48:01.000000000 -0500
@@ -42,7 +42,8 @@
#include <cstdio> // C standard I/O
#include <fstream> // file I/O
-#include <string> // string manipulation
+#include <cstring> // string manipulation
+#include <cstdlib>
#include <ANN/ANNx.h> // all ANN includes
using namespace std; // make std:: accessible
diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/bindings/ann_wrap.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/bindings/ann_wrap.cpp
--- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/bindings/ann_wrap.cpp 2008-04-28 12:08:55.000000000 -0500
+++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/bindings/ann_wrap.cpp 2008-05-01 12:48:01.000000000 -0500
@@ -8,6 +8,8 @@
* interface file instead.
* ----------------------------------------------------------------------------- */
+#include <cstring>
+
#define SWIG_name_d "ann"
#define SWIG_name ann
diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/Make-config octave-forge-bundle-20080429/main/ann-1.0/src/ann/Make-config
--- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/Make-config 2008-04-28 12:08:55.000000000 -0500
+++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/Make-config 2008-05-01 12:48:38.000000000 -0500
@@ -72,7 +72,7 @@
$(MAKE) targets \
"ANNLIB = libANN.a" \
"C++ = g++" \
- "CFLAGS = -O3" \
+ "CFLAGS = -fPIC -O3" \
"MAKELIB = ar ruv" \
"RANLIB = true"
diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/src/kd_dump.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/src/kd_dump.cpp
--- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/src/kd_dump.cpp 2008-04-28 12:08:54.000000000 -0500
+++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/src/kd_dump.cpp 2008-05-01 12:48:01.000000000 -0500
@@ -33,6 +33,8 @@
#include "kd_tree.h" // kd-tree declarations
#include "bd_tree.h" // bd-tree declarations
+#include <cstdlib>
+#include <cstring>
using namespace std; // make std:: available
diff -ur octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/test/ann_test.cpp octave-forge-bundle-20080429/main/ann-1.0/src/ann/test/ann_test.cpp
--- octave-forge-bundle-20080429.orig/main/ann-1.0/src/ann/test/ann_test.cpp 2008-04-28 12:08:50.000000000 -0500
+++ octave-forge-bundle-20080429/main/ann-1.0/src/ann/test/ann_test.cpp 2008-05-01 12:48:01.000000000 -0500
@@ -36,8 +36,9 @@
#include <ctime> // clock
#include <cmath> // math routines
-#include <string> // C string ops
+#include <cstring> // C string ops
#include <fstream> // file I/O
+#include <cstdlib>
#include <ANN/ANN.h> // ANN declarations
#include <ANN/ANNx.h> // more ANN declarations
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 12 Dec 2007 22:06:30 -0000 1.11
+++ .cvsignore 2 May 2008 15:59:03 -0000 1.12
@@ -1 +1 @@
-octave-forge-bundle-20071212.patched.tar.gz
+octave-forge-bundle-20080429.patched.tar.gz
Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/F-9/octave-forge.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- octave-forge.spec 28 Feb 2008 10:36:16 -0000 1.53
+++ octave-forge.spec 2 May 2008 15:59:03 -0000 1.54
@@ -1,8 +1,8 @@
%{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
Name: octave-forge
-Version: 20071212
-Release: 8%{?dist}
+Version: 20080429
+Release: 1%{?dist}
Summary: Contributed functions for octave
Group: Applications/Engineering
@@ -17,71 +17,84 @@
## 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
-buIldRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: %{name}-20080429-gcc43.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 qhull-devel
+BuildRequires: tetex gcc-gfortran ginac-devel
BuildRequires: ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
-BuildRequires: libjpeg-devel libpng-devel ncurses-devel
-BuildRequires: openssl-devel java-devel dos2unix
-Provides: octave-audio = 1.0.2
-Provides: octave-combinatorics = 1.0.3
-Provides: octave-communications = 1.0.3
-Provides: octave-control = 1.0.2
-Provides: octave-econometrics = 1.0.3
-Provides: octave-fixed = 0.7.3
-Provides: octave-general = 1.0.3
-Provides: octave-gsl = 1.0.2
-Provides: octave-ident = 1.0.2
-Provides: octave-image = 1.0.3
-Provides: octave-informationtheory = 0.1.2
-Provides: octave-io = 1.0.3
-Provides: octave-irsa = 1.0.2
-Provides: octave-linear-algebra = 1.0.2
-Provides: octave-miscellaneous = 1.0.3
-Provides: octave-nnet = 0.1.4
-Provides: octave-octcdf = 1.0.6
-Provides: octave-odebvp = 1.0.1
-Provides: octave-odepkg = 0.3.3
-Provides: octave-optim = 1.0.0
-Provides: octave-optiminterp = 0.2.4
-Provides: octave-outliers = 0.13.4
+BuildRequires: libjpeg-devel libpng-devel ncurses-devel ftplib-devel
+BuildRequires: openssl-devel java-devel
+Provides: octave-audio = 1.1.1
+Provides: octave-ann = 1.0
+Provides: octave-bioinfo = 0.1.0
+Provides: octave-combinatorics = 1.0.6
+Provides: octave-communications = 1.0.6
+Provides: octave-control = 1.0.6
+#Provides: octave-database = 1.0
+Provides: octave-data-smoothing = 1.0.0
+Provides: octave-econometrics = 1.0.6
+Provides: octave-financial = 0.2.2
+Provides: octave-fixed = 0.7.6
+Provides: octave-ftp = 1.0
+Provides: octave-ga = 0.1.1
+Provides: octave-general = 1.0.6
+Provides: octave-gsl = 1.0.6
+Provides: octave-ident = 1.0.5
+Provides: octave-image = 1.0.6
+Provides: octave-informationtheory = 0.1.5
+Provides: octave-io = 1.0.6
+Provides: octave-irsa = 1.0.5
+Provides: octave-linear-algebra = 1.0.5
+Provides: octave-miscellaneous = 1.0.6
+Provides: octave-missing-functions = 1.0.0
+Provides: octave-nnet = 0.1.7
+Provides: octave-octcdf = 1.0.9
+Provides: octave-octgpr = 1.1.3
+Provides: octave-odebvp = 1.0.4
+Provides: octave-odepkg = 0.6.0
+Provides: octave-optim = 1.0.2
+Provides: octave-optiminterp = 0.2.7
+Provides: octave-outliers = 0.13.7
%ifnarch x86_64 ppc64
-Provides: octave-parallel = 1.0.3
+Provides: octave-parallel = 1.0.6
%endif
-Provides: octave-physicalconstants = 0.1.2
-Provides: octave-plot = 1.0.2
-Provides: octave-signal = 1.0.4
-Provides: octave-sockets = 1.0.2
-Provides: octave-specfun = 1.0.3
-Provides: octave-special-matrix = 1.0.2
-Provides: octave-splines = 1.0.2
-Provides: octave-statistics = 1.0.3
-Provides: octave-strings = 1.0.2
-Provides: octave-struct = 1.0.2
-Provides: octave-symbolic = 1.0.3
-Provides: octave-time = 1.0.2
-Provides: octave-vrml = 1.0.3
-Provides: octave-zenity = 0.5.2
-Provides: octave-bim = 0.0.2
-Provides: octave-civil-engineering = 1.0.2
-Provides: octave-fpl = 0.0.2
-Provides: octave-graceplot = 1.0.2
-Provides: octave-integration = 1.0.2
-Provides: octave-java = 1.2.1
-Provides: octave-mapping = 1.0.2
-Provides: octave-msh = 0.0.2
-Provides: octave-nan = 1.0.2
-Provides: octave-pdb = 1.0.2
-Provides: octave-secs1d = 0.0.3
-Provides: octave-secs2d = 0.0.3
-Provides: octave-symband = 1.0.3
-Provides: octave-tcl-octave = 0.1.3
-Provides: octave-triangular = 1.0.1
-Provides: octave-tsa = 3.10.3
-Provides: octave-xraylib = 1.0.3
-Provides: octave-language-pt_br = 1.0.3
+Provides: octave-physicalconstants = 0.1.5
+Provides: octave-plot = 1.0.5
+Provides: octave-signal = 1.0.7
+Provides: octave-sockets = 1.0.4
+Provides: octave-specfun = 1.0.6
+Provides: octave-special-matrix = 1.0.5
+Provides: octave-splines = 1.0.5
+Provides: octave-statistics = 1.0.6
+Provides: octave-strings = 1.0.5
+Provides: octave-struct = 1.0.5
+Provides: octave-symbolic = 1.0.6
+Provides: octave-time = 1.0.7
+Provides: octave-vrml = 1.0.6
+Provides: octave-zenity = 0.5.5
+Provides: octave-ad = 1.0.2
+Provides: octave-bim = 0.0.6
+Provides: octave-civil-engineering = 1.0.5
+Provides: octave-fpl = 0.1.2
+Provides: octave-graceplot = 1.0.5
+Provides: octave-integration = 1.0.5
+Provides: octave-java = 1.2.4
+Provides: octave-mapping = 1.0.5
+Provides: octave-msh = 0.0.6
+Provides: octave-multicore = 0.2.12
+Provides: octave-nan = 1.0.6
+Provides: octave-ocs = 0.0.1
+Provides: octave-pdb = 1.0.5
+Provides: octave-secs1d = 0.0.6
+Provides: octave-secs2d = 0.0.6
+Provides: octave-symband = 1.0.6
+Provides: octave-tcl-octave = 0.1.6
+Provides: octave-triangular = 1.0.4
+Provides: octave-tsa = 3.10.6
+Provides: octave-xraylib = 1.0.6
+Provides: octave-language-pt_br = 1.0.6
%description
Octave-forge is a community project for collaborative development of
@@ -97,14 +110,18 @@
%ifarch x86_64 ppc64
rm main/parallel-*.tar.gz
%endif
-#Don't install engine - not a real octave package
+# The scripts below will build everything automatically, so first
+# remove some packages that we don't want to build:
+# 1. video stuff requires non-free libraries
+rm main/video-*.tar.gz
+# 2. engine is not a real octave package
rm extra/engine-*.tar.gz
-#Can't handle jhandles yet
+# 3. can't handle jhandles yet
rm extra/jhandles-*.tar.gz
-#Not MacOSX
-rm extra/macosx-*.tar.gz
-#Not Windows
+# 4. other OS stuff
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
@@ -120,21 +137,11 @@
cd ..
done
-# edit.m is now in octave
-rm main/miscellaneous-1.0.4/inst/edit.m
-
-#Cleanup some CVS directories
-find -name CVS | xargs rm -rf
+%patch0 -p1
#Install with -nodeps
sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
-#Fix permissions
-find -name COPYING -o -name INDEX -o -name DESCRIPTION -o -name \*.m | xargs chmod -x
-
-#Fix line endings
-find -name \*.m | xargs dos2unix
-
%build
#Prevents escape sequence from being inserted into octave version string
@@ -185,13 +192,6 @@
cd ..
done
-#Move aurecord to arch-dependent dir
-archdir=%{_libexecdir}/octave/packages/`octave-config -p CANONICAL_HOST_TYPE`-%{octave_api}
-audiover=`basename $RPM_BUILD_ROOT%{_datadir}/octave/packages/audio-*`
-mkdir -p $RPM_BUILD_ROOT${archdir}/${audiover}
-mv $RPM_BUILD_ROOT%{_datadir}/octave/packages/${audiover}/bin \
- $RPM_BUILD_ROOT${archdir}/${audiover}/
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -211,6 +211,11 @@
%changelog
+* Fri May 2 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-1
+- New release.
+- Add ftplib-devel as dependency.
+- Remove obsolete dependencies and obsolete build steps.
+
* Thu Feb 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 20071212-8
- Rebuild for cln soname bump
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 12 Dec 2007 22:06:30 -0000 1.11
+++ sources 2 May 2008 15:59:03 -0000 1.12
@@ -1 +1 @@
-686616f713a92171bc4902f76f0c58e2 octave-forge-bundle-20071212.patched.tar.gz
+c8970c00aa57076909d44ad1c1fb2bfe octave-forge-bundle-20080429.patched.tar.gz
- Previous message: fedora-release fedora-release.spec,1.58.2.2,1.58.2.3
- Next message: rpms/system-config-printer/F-9 system-config-printer-authconn.patch, NONE, 1.1 system-config-printer.spec, 1.178, 1.179 system-config-printer.console, 1.2, NONE system-config-printer.pam, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list