rpms/octave/devel .cvsignore, 1.15, 1.16 octave.spec, 1.62, 1.63 sources, 1.15, 1.16 octave-2.9.15-pkg.patch, 1.1, NONE

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7273

Modified Files:
	.cvsignore octave.spec sources 
Removed Files:
	octave-2.9.15-pkg.patch 
Log Message:
New release. Update license tag. Remove unnecessary CPPFLAGS.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Oct 2007 21:36:46 -0000	1.15
+++ .cvsignore	7 Nov 2007 21:47:48 -0000	1.16
@@ -1 +1 @@
-octave-2.9.15.tar.bz2
+octave-2.9.16.tar.bz2


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- octave.spec	16 Oct 2007 19:46:53 -0000	1.62
+++ octave.spec	7 Nov 2007 21:47:48 -0000	1.63
@@ -1,16 +1,15 @@
 # From src/version.h:#define OCTAVE_API_VERSION
-%define octave_api api-v27
+%define octave_api api-v28
 
 Name:           octave
-Version:        2.9.15
-Release:        2%{?dist}
+Version:        2.9.16
+Release:        1%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
-License:        GPLv2+
+License:        GPLv3+
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
-Patch:          octave-2.9.15-pkg.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -54,7 +53,6 @@
 
 %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
@@ -65,7 +63,6 @@
 
 %build
 %define enable64 no
-export CPPFLAGS=-I%{_includedir}/glpk
 %configure --enable-shared --disable-static --enable-64=%enable64 --with-f77=gfortran
 make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}"
 
@@ -142,6 +139,11 @@
 
 
 %changelog
+* Mon Nov  5 2007 Quentin Spencer <qspencer at 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 at ora.nwra.com> 2.9.15-2
 - Updated pkg.m patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Oct 2007 21:36:46 -0000	1.15
+++ sources	7 Nov 2007 21:47:48 -0000	1.16
@@ -1 +1 @@
-c7c0449a5e1418479bebbdd565eb9cc2  octave-2.9.15.tar.bz2
+a7cbe4d897dd6f8d6d4aaff413a9c490  octave-2.9.16.tar.bz2


--- octave-2.9.15-pkg.patch DELETED ---