rpms/octave-forge/F-7 octave-forge-20071014-parallel.patch, NONE, 1.1 octave-forge-20071014-time.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 octave-forge.spec, 1.34, 1.35 sources, 1.9, 1.10 octave-forge-2006.07.09-imread.patch, 1.1, NONE octave-forge-2006.07.09-legend.patch, 1.1, NONE octave-forge-2006.07.09-path.patch, 1.1, NONE

Fri Nov 9 20:02:07 UTC 2007

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28997

Modified Files:
	.cvsignore octave-forge.spec sources 
Added Files:
	octave-forge-20071014-parallel.patch 
	octave-forge-20071014-time.patch 
Removed Files:
	octave-forge-2006.07.09-imread.patch 
	octave-forge-2006.07.09-legend.patch 
	octave-forge-2006.07.09-path.patch 
Log Message:
Update to 20071014 and port various changes from devel branch.

octave-forge-20071014-parallel.patch:

--- NEW FILE octave-forge-20071014-parallel.patch ---
--- octave-forge-bundle-20071014/main/odepkg-0.3.3/src/Makefile.parallel	2007-10-16 20:45:12.000000000 -0600
+++ octave-forge-bundle-20071014/main/odepkg-0.3.3/src/Makefile	2007-10-16 20:46:02.000000000 -0600
@@ -83,7 +83,9 @@
 %.mex : %.o ; $(MKMEXFILE) $^ -o $@
 
 
-all : $(EXTERNALDIRS) $(ODEPKGOBJECTS) $(ODEPKGMXFILES)
+all :
+	@$(MAKE) $(EXTERNALDIRS)
+	@$(MAKE) $(ODEPKGOBJECTS) $(ODEPKGMXFILES)
 
 $(DOPRI5MXFILES) : $(DOPRI5OBJECTS)
 $(DOP853MXFILES) : $(DOP853OBJECTS)
--- octave-forge-bundle-20071014/main/optiminterp-0.2.4/src/Makefile.parallel	2007-10-16 22:57:12.000000000 -0600
+++ octave-forge-bundle-20071014/main/optiminterp-0.2.4/src/Makefile	2007-10-16 22:59:47.000000000 -0600
@@ -28,3 +28,6 @@
 
 clean:
 	rm -f *.o *.oct *~ *.mod
+
+#It really depends on the .mod, but this should work for deps
+optiminterp_wrapper.o: optimal_interpolation.o

octave-forge-20071014-time.patch:

--- NEW FILE octave-forge-20071014-time.patch ---
Index: listen.cc
===================================================================
--- octave-forge-bundle-20071014/main/miscellaneous-1.0.3/src/listen.cc	(revision 4170)
+++ octave-forge-bundle-20071014/main/miscellaneous-1.0.3/src/listen.cc	(working copy)
@@ -33,8 +33,8 @@
 static char* context = NULL;
 
 static double timestamp = 0.0;
-inline void tic(void) { timestamp = octave_time(); }
-inline double toc(void) {return ceil(-1e6*(timestamp-double(octave_time())));}
+inline void tic(void) { timestamp = octave_time().double_value(); }
+inline double toc(void) {return ceil(-1e6*(timestamp-octave_time().double_value()));}
 
 // XXX FIXME XXX --- surely this is part of the standard library?
 void


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/F-7/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	10 Jul 2006 18:48:25 -0000	1.9
+++ .cvsignore	9 Nov 2007 20:01:30 -0000	1.10
@@ -1 +1 @@
-octave-forge-2006.07.09.patched.tar.gz
+octave-forge-bundle-20071014.patched.tar.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/F-7/octave-forge.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- octave-forge.spec	20 Feb 2007 18:09:52 -0000	1.34
+++ octave-forge.spec	9 Nov 2007 20:01:30 -0000	1.35
@@ -1,78 +1,224 @@
+%{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
+
 Name:           octave-forge
-Version:        2006.07.09
-Release:        9%{?dist}
+Version:        20071014
+Release:        3%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
-License:        Public Domain
+License:        GPLv2+ and Public Domain
 URL:            http://octave.sourceforge.net
-## Source0:        http://umn.dl.sourceforge.net/sourceforge/octave/%{name}-%{version}.tar.gz
+## Source0:        http://downloads.sourceforge.net/sourceforge/octave/%{name}-bundle-%{version}.tar.gz
 ## The original sources contain a non-free tree of functions that are
 ## GPL incompatible. A patched version with the non-free sources removed
 ## is created as follows:
-## tar xzf octave-forge-%{version}.tar.gz
-## rm -Rf octave-forge-%{version}/nonfree/
-## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
-## rm -Rf octave-forge-%{version}
-Source0:        %{name}-%{version}.patched.tar.gz
-Patch0:         octave-forge-2006.07.09-legend.patch
-Patch1:         octave-forge-2006.07.09-imread.patch
-Patch2:         octave-forge-2006.07.09-path.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires:	octave octave(api) = api-v22 ImageMagick
-BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
+## tar xzf octave-forge-bundle-%{version}.tar.gz
+## rm -Rf octave-forge-bundle-%{version}/nonfree/
+## 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:         octave-forge-20071014-parallel.patch
+Patch1:         octave-forge-20071014-time.patch
+buIldRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:	octave(api) = %{octave_api} ImageMagick
+BuildRequires:  octave-devel >= 6:2.9.15-2
+BuildRequires:  tetex gcc-gfortran ginac-devel qhull-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
+%ifnarch x86_64 ppc64
+Provides: octave-parallel = 1.0.3
+%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
 
 %description
 Octave-forge is a community project for collaborative development of
 octave extensions. The extensions in this package include additional
 data types such as sparse matrices, and functions for a variety of
 different applications including signal and image processing,
-communications, control, optimization, statistics, geometry, and
-symbolic math.
+communications, control, optimization, statistics, and symbolic math.
+
 
 %prep
-%setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-# For octave >= 2.9.7, don't install the mex stuff or path stuff
-touch extra/mex/NOINSTALL
-touch main/path/NOINSTALL
+%setup -q -n octave-forge-bundle-%{version}
+#Not 64-bit safe
+%ifarch x86_64 ppc64
+rm main/parallel-*.tar.gz
+%endif
+#Don't install engine - not a real octave package
+rm extra/engine-*.tar.gz
+#Can't handle jhandles yet
+rm extra/jhandles-*.tar.gz
+#Not MacOSX
+rm extra/macosx-*.tar.gz
+#Not Windows
+rm extra/windows-*.tar.gz
+
+#Unpack everything
+for pkg in main extra language
+do
+   cd $pkg
+   for tgz in *.tar.gz
+   do
+      tar xzf $tgz
+
+      #Collect provides
+      echo $tgz | sed 's/\(.*\)-\([0-9]*\.[0-9]*\.[0-9]*\)\.tar\.gz/Provides: octave-\1 = \2/' >> ../octave-forge-provides
+   done
+   cd ..
+done
+
+#Patches
+%patch0 -p1 -b .parallel
+%patch1 -p1 -b .time
+
+#Cleanup some CVS directories
+find -name CVS | xargs rm -rf
+
+#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
-ALTMPATHNAME=%{_datadir}/octave/site/octave-forge-alternatives/m/octave-forge
-XPATHNAME=`octave-config -p LOCALARCHLIBDIR`/octave-forge
-%configure --with-altmpath=$ALTMPATHNAME --with-xpath=$XPATHNAME
-make %{?_smp_mflags}
+#Prevents escape sequence from being inserted into octave version string
+export TERM=""
+for pkg in main extra language
+do
+   cd $pkg
+   for dir in *.[0-9]
+   do
+      cd $dir
+      if [ -f configure ]
+      then
+         %configure
+      elif [ -f src/configure ]
+      then
+         cd src
+         %configure
+         cd ..
+      fi
+      if [ -f Makefile ]
+      then
+         make %{?_smp_mflags} TMPDIR=%{_tmppath}
+      elif [ -f src/Makefile ]
+      then
+         cd src
+         make %{?_smp_mflags} TMPDIR=%{_tmppath}
+         cd ..
+      fi
+      cd ..
+   done
+   cd ..
+done
+   
 
 %install
 rm -rf $RPM_BUILD_ROOT
-ALTPATHNAME=octave/site/octave-forge-alternatives
-HOSTTYPE=`octave-config -p CANONICAL_HOST_TYPE`
-%makeinstall \
-  MPATH=$RPM_BUILD_ROOT`octave-config -p LOCALFCNFILEDIR`/octave-forge \
-  OPATH=$RPM_BUILD_ROOT`octave-config -p LOCALAPIOCTFILEDIR`/octave-forge \
-  XPATH=$RPM_BUILD_ROOT`octave-config -p LOCALARCHLIBDIR`/octave-forge \
-  ALTPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m \
-  ALTMPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m/octave-forge \
-  ALTOPATH=$RPM_BUILD_ROOT%{_libexecdir}/$ALTPATHNAME/oct/$HOSTTYPE
+export TERM=""
+
+for pkg in main extra language
+do
+   cd $pkg
+   for dir in *.[0-9]
+   do
+       cd $dir
+       make install TMPDIR=%{_tmppath} DESTDIR=$RPM_BUILD_ROOT DISTPKG=redhat
+       cd ..
+   done
+   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
 
+
+%post
+octave -q -H --no-site-file --eval "pkg('rebuild');"
+
+%postun
+octave -q -H --no-site-file --eval "pkg('rebuild');"
+
+
 %files
-%defattr(-,root,root)
-%doc COPYING* README RELEASE-NOTES TODO
-%doc doc/*.html doc/coda/*.sgml doc/coda/appendices/*.sgml
-%doc doc/coda/oct/*.sgml doc/coda/standalone/*.sgml
-%{_datadir}/octave/*
-%{_libexecdir}/octave/*
+%defattr(-,root,root,-)
+%{_datadir}/octave/packages/*
+%{_libexecdir}/octave/packages/*
 
 
 %changelog
+* Wed Nov  7 2007 Quentin Spencer <qspencer at users.sf.net> 20071014-1
+- Update to 20071014.
+- Remove old patches and add new ones.
+- Extensive changes to build procedure ported from devel branch.
+
 * Tue Feb 20 2007 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-9
 - Remove libtermcap-devel as build dependency (Bug 226768).
 - Change octave version dependency to octave(api) dependency,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	10 Jul 2006 18:48:25 -0000	1.9
+++ sources	9 Nov 2007 20:01:30 -0000	1.10
@@ -1 +1 @@
-49efa08b2b68267d87173ffef8866485  octave-forge-2006.07.09.patched.tar.gz
+f237bd3e3e16cf40e5da77ca2aed3e51  octave-forge-bundle-20071014.patched.tar.gz


--- octave-forge-2006.07.09-imread.patch DELETED ---


--- octave-forge-2006.07.09-legend.patch DELETED ---


--- octave-forge-2006.07.09-path.patch DELETED ---


