rpms/octave/devel octave-2.9.15-pkg.patch, NONE, 1.1 octave.spec, 1.61, 1.62

Orion Poplawski (orion) fedora-extras-commits at redhat.com
Tue Oct 16 19:47:26 UTC 2007


Author: orion

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

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.15-pkg.patch 
Log Message:
* Tue Oct 16 2007 Orion Poplawski <orion at ora.nwra.com> 2.9.15-2
- Updated pkg.m patch


octave-2.9.15-pkg.patch:

--- NEW FILE octave-2.9.15-pkg.patch ---
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);
 


Index: octave.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave/devel/octave.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- octave.spec	15 Oct 2007 21:36:46 -0000	1.61
+++ octave.spec	16 Oct 2007 19:46:53 -0000	1.62
@@ -3,13 +3,14 @@
 
 Name:           octave
 Version:        2.9.15
-Release:        1%{?dist}
+Release:        2%{?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
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -53,6 +54,7 @@
 
 %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
@@ -140,6 +142,9 @@
 
 
 %changelog
+* Tue Oct 16 2007 Orion Poplawski <orion at ora.nwra.com> 2.9.15-2
+- Updated pkg.m patch
+
 * Mon Oct 15 2007 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.15-1
 - New release. Remove old patch.
 




More information about the fedora-extras-commits mailing list