rpms/octave-forge/EL-5 octave-forge.spec, 1.33, 1.34 sources, 1.10, 1.11

Jussi Lehtola jussilehtola at fedoraproject.org
Sat Jul 11 09:22:00 UTC 2009


Author: jussilehtola

Update of /cvs/pkgs/rpms/octave-forge/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11979/EL-5

Modified Files:
	octave-forge.spec sources 
Log Message:
Updated EL-5 branch.


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/EL-5/octave-forge.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- octave-forge.spec	10 Jan 2008 14:27:39 -0000	1.33
+++ octave-forge.spec	11 Jul 2009 09:21:30 -0000	1.34
@@ -1,8 +1,8 @@
 %{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
 
 Name:           octave-forge
-Version:        20071212
-Release:        6%{?dist}
+Version:        20080831
+Release:        9%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,71 +17,83 @@ 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
-buIldRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         %{name}-image-1.0.8-build.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
-%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
+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
+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
+
 
 %description
 Octave-forge is a community project for collaborative development of
@@ -93,18 +105,18 @@ optimization, statistics, and symbolic m
 
 %prep
 %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
+# 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. jhandles depends on jogl, which is forbidden from Fedora
 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 +132,12 @@ do
    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
+#apply patch to build image-1.0.8 (bug #477577)
+%patch0 -p0
 
 #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 +188,6 @@ do
    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
@@ -206,16 +202,115 @@ octave -q -H --no-site-file --eval "pkg(
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/octave/packages/*
-%{_libexecdir}/octave/packages/*
+%{_datadir}/octave/packages/
+%{_libexecdir}/octave/packages/
 
 
 %changelog
-* Thu Jan 10 2008 Quentin Spencer <qspencer at users.sf.net> 20071212-6
-- Port 20071212 changes from devel branch for compatibility with octave 3.0.0.
+* Thu Jul  9 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-9
+- Rebuild for dependencies
+
+* Sat Mar 28 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-8
+- Rebuild for new ginac.
+
+* Tue Mar 10 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-7
+- Fix BuildRequires to specifically request GCJ version of Java.
+
+* Tue Mar 10 2009 Rakesh Pandit <rakesh at fedorapeople.org> - 20080831-6
+- Bumped to consume the soname update in ImageMagic.
+
+* Tue Feb 24 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-5
+- Rebuild against new hdf5 and for GCC 4.4.
+
+* Mon Jan  5 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20080831-4
+- Patch to temporarily get image subpackage to build (#477577)
+
+* Sun Jan 04 2009 Rakesh Pandit <rakesh at fedoraproject.org> 20080831-3
+- Fixed unowned directories (BZ 474675)
+
+* Thu Sep 11 2008 Orion Poplawski <orion at cora.nwra.com>  20080831-2
+- Rebuild for new libdap
+
+* Mon Sep 8 2008 Orion Poplawski <orion at cora.nwra.com>  20080831-1
+- Update to 20080831
+- Drop upstreamed patches
+- Enable octave-parallel for 64-bit platforms
+
+* Fri May  2 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-6
+- Add patch for new ImageMagick.
+
+* Thu May  1 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-5
+- Modify the patch to fix compile flags in a subpackage.
+
+* Thu May  1 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-4
+- Extend the gcc 4.3 patch to more files.
+
+* Thu May  1 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-3
+- Fix the gcc 4.3 patch.
+
+* Thu May  1 2008 Quentin Spencer <qspencer at users.sf.net> 20080429-2
+- Patch so it will compile with gcc 4.3.
+
+* Wed Apr 30 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
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 20071212-7
+- Autorebuild for GCC 4.3
+
+* Wed Jan  2 2008 Quentin Spencer <qspencer at users.sf.net> 20071212-6
+- Rebuild for libdap API change.
+
+* Wed Dec 26 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-5
+- Rebuild for octave 3.0.0. Remove edit.m because it's now in octave.
+
+* Thu Dec 20 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-4
+- I give up. Disable parallel build.
+
+* Thu Dec 20 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-3
+- Try the patch again.
+
+* Thu Dec 20 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-2
+- Add patch to fix parallel build of odepkg and optiminterp (again).
+
+* Wed Dec 12 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-1
+- New release. Remove old patches that are now in sources.
+- Update package description (some functions mentioned are now in octave).
+
+* Wed Dec  5 2007 Quentin Spencer <qspencer at users.sf.net> 20071014-5
+- Rebuild for new octave
+
+* Sat Dec  1 2007 Alex Lancaster <alexlan at fedoraproject.org> 20071014-4
+- Rebuild for new octave
+
+* Wed Nov  7 2007 Quentin Spencer <qspencer at users.sf.net> 20071014-3
+- Add new patch to listen.cc for compatibility with octave-2.9.16
+
+* Tue Oct 16 2007 Orion Poplawski <orion at cora.nwra.com>  20071014-2
+- Add patch to fix parallel build of odepkg and optiminterp
+
+* Tue Oct 16 2007 Orion Poplawski <orion at cora.nwra.com>  20071014-1
+- Rewrite to handle new "bundle" method to releasing packages and
+  new octave package manager
+- Prepare for eventual splitting of the package with provides
+
+* Mon Sep 24 2007 Jesse Keating <jkeating at redhat.com> - 2006.07.09-10
+- Rebuild for new octave
+
+* 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,
+  which is now provided by the octave package.
+
+* Mon Nov 06 2006 Jindrich Novy <jnovy at redhat.com> 2006.07.09-8
+- rebuild against the new curl
 
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 2006.07.09-7
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Sat Sep 23 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-6
 - Rebuild for updated libdap.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	10 Jan 2008 14:27:39 -0000	1.10
+++ sources	11 Jul 2009 09:21:30 -0000	1.11
@@ -1 +1 @@
-686616f713a92171bc4902f76f0c58e2  octave-forge-bundle-20071212.patched.tar.gz
+5df8ff572c9b990e404ba94a6724c898  octave-forge-bundle-20080831.patched.tar.gz




More information about the fedora-extras-commits mailing list