dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-octave-3.0.0.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-3.0.0-gcc43.patch

@@ -1,11 +0,0 @@
---- octave-3.0.0/src/mxarray.h.in.gcc43	2007-10-23 18:32:44.000000000 -0600
-+++ octave-3.0.0/src/mxarray.h.in	2008-02-29 11:24:03.000000000 -0700
-@@ -46,6 +46,8 @@
- #if ! defined (MXARRAY_H)
- #define MXARRAY_H
- 
-+#include <string.h>
-+
- typedef enum
-   {
-     mxREAL = 0,

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

@@ -2,15 +2,15 @@
 %define octave_api api-v32
 
 Name:           octave
-Version:        3.0.0
-Release:        6%{?dist}
+Version:        3.0.3
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPLv3+
 Source:         ftp://ftp.octave.org/pub/octave/octave-%{version}.tar.bz2
-Patch:          octave-3.0.0-gcc43.patch
+Patch1:         octave-sh-arch.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -55,7 +55,6 @@ applications which use GNU Octave.
 
 %prep
 %setup -q
-%patch -p1 -b .gcc43
 # Check that octave_api is set correctly
 if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
 then
@@ -63,12 +62,14 @@ then
   exit 1
 fi
 
+# patch for sh arch
+%patch1 -p1 -b .sh-arch
 
 %build
 %define enable64 no
 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
@@ -143,6 +144,18 @@ 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.

sources

@@ -1 +1 @@
-d5512acdf60ac04398ff258cbc37f3c4  octave-3.0.0.tar.bz2
+38d258d60242cf4844e3c4350691ccff  octave-3.0.3.tar.bz2