dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-octave-2.9.15.tar.bz2

.gitignore

@@ -0,0 +1 @@
+octave-3.0.3.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: octave
-# $Id$
-NAME := octave
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

octave-2.9.15-pkg.patch

@@ -1,21 +0,0 @@
-Index: scripts/pkg/pkg.m
-===================================================================
-RCS file: /usr/local/cvsroot/octave/scripts/pkg/pkg.m,v
-retrieving revision 1.63
-retrieving revision 1.64
-diff -u -r1.63 -r1.64
---- scripts/pkg/pkg.m	12 Oct 2007 21:27:23 -0000	1.63
-+++ scripts/pkg/pkg.m	14 Oct 2007 19:28:42 -0000	1.64
-@@ -1095,7 +1095,11 @@
-     endif
- 
-     ## Split into architecture dependent and independent files
--    idx = cellfun (@(x) is_architecture_dependent (x), filenames);
-+    if (isempty (filenames))
-+      idx = [];
-+    else
-+      idx = cellfun (@(x) is_architecture_dependent (x), filenames);
-+    endif
-     archdependent = filenames (idx);
-     archindependent = filenames (!idx);
- 

octave-sh-arch.patch

@@ -0,0 +1,12 @@
+diff -u octave-3.0.2.org/configure octave-3.0.2/configure
+--- octave-3.0.2.org/configure	2008-10-23 20:03:19.000000000 +0530
++++ octave-3.0.2/configure	2008-10-23 20:03:44.000000000 +0530
+@@ -11078,7 +11078,7 @@
+ 
+           ;;
+           # Ignore these flags.
+-        -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
++        -little| -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -LANG:=* | -LIST:* | -LNO:*)
+           ;;
+         -lkernel32)
+           test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"

octave.spec

@@ -1,16 +1,16 @@
 # From src/version.h:#define OCTAVE_API_VERSION
-%define octave_api api-v27
+%define octave_api api-v32
 
 Name:           octave
-Version:        2.9.15
-Release:        2%{?dist}
+Version:        3.0.3
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
-License:        GPLv2+
-Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
-Patch:          octave-2.9.15-pkg.patch
+License:        GPLv3+
+Source:         ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
+Patch1:         octave-sh-arch.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -20,6 +20,7 @@ Requires(preun): /sbin/install-info
 BuildRequires:  bison flex less tetex gcc-gfortran lapack-devel blas-devel
 BuildRequires:  ncurses-devel zlib-devel hdf5-devel texinfo qhull-devel
 BuildRequires:  readline-devel glibc-devel fftw-devel gperf ghostscript
+BuildRequires:  curl-devel pcre-devel
 BuildRequires:  suitesparse-devel glpk-devel gnuplot desktop-file-utils
 Provides:       octave(api) = %{octave_api}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,7 +55,6 @@ applications which use GNU Octave.
 
 %prep
 %setup -q
-%patch -p0 -b .pkg
 # Check that octave_api is set correctly
 if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
 then
@@ -62,12 +62,14 @@ then
   exit 1
 fi
 
+# patch for sh arch
+%patch1 -p1 -b .sh-arch
 
 %build
 %define enable64 no
-export CPPFLAGS=-I%{_includedir}/glpk
+export CPPFLAGS="-DH5_USE_16_API"
 %configure --enable-shared --disable-static --enable-64=%enable64 --with-f77=gfortran
-make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}"
+make %{?_smp_mflags} OCTAVE_RELEASE="Fedora %{version}-%{release}"
 
 
 %install
@@ -142,6 +144,53 @@ fi
 
 
 %changelog
+* Wed Dec 10 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 3.0.3-1
+- Update to latest upstream (3.0.3)
+
+* Thu Oct 23 2008 Rakesh Pandit <rakesh@fedoraproject.org> 3.0.2-2
+- patch for sh arch: it adds '-little' flag
+
+* Mon Sep 8 2008 Orion Poplawski <orion@cora.nwra.com> 3.0.2-1
+- Update to 3.0.2
+
+* Mon Apr 21 2008 Quentin Spencer <qspencer@users.sf.net> 3.0.1-1
+- New release of octave. Remove gcc 4.3 patch.
+
+* Mon Mar  3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.0.0-6
+- Re-enable patch, but change cstring -> string.h so it works for C as
+  well as C++.  Hopefully this will #435600 for real.
+
+* Sun Mar  2 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 6:3.0.0-5
+- Backout GCC 4.3 patch temporarily, causes trouble for octave-forge and 
+  may not be necessary (#435600)
+
+* Fri Feb 29 2008 Orion Poplawski <orion@cora.nwra.com> 3.0.0-4
+- Rebuild for hdf5 1.8.0 using compatability API define
+- Add gcc43 patch
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 6:3.0.0-3
+- Autorebuild for GCC 4.3
+
+* Wed Jan  9 2008 Quentin Spencer <qspencer@users.sf.net> 3.0.0-2
+- Add curl-devel and pcre-devel as build dependencies. Closes bug 302231.
+
+* Fri Dec 21 2007 Quentin Spencer <qspencer@users.sf.net> 3.0.0-1
+- Update to 3.0.0.
+
+* Wed Dec 12 2007 Quentin Spencer <qspencer@users.sf.net> 2.9.19-1
+- Update to 2.9.19 and update octave_api.
+
+* Wed Dec  5 2007 Quentin Spencer <qspencer@users.sf.net> 2.9.18-1
+- Update to 2.9.18 and update octave_api.
+
+* Wed Nov 28 2007 Quentin Spencer <qspencer@users.sf.net> 2.9.17-1
+- Update to 2.9.17 and update octave_api.
+
+* Mon Nov  5 2007 Quentin Spencer <qspencer@users.sf.net> 2.9.16-1
+- Update to 2.9.16, remove old patch.
+- Update licencse from GPLv2+ to GPLv3+.
+- Detection of glpk no longer needs special CPPFLAGS.
+
 * Tue Oct 16 2007 Orion Poplawski <orion@ora.nwra.com> 2.9.15-2
 - Updated pkg.m patch
 

sources

@@ -1 +1 @@
-c7c0449a5e1418479bebbdd565eb9cc2  octave-2.9.15.tar.bz2
+38d258d60242cf4844e3c4350691ccff  octave-3.0.3.tar.bz2