rpms/octave-forge/devel octave-forge-2006.01.28.patch, 1.1, 1.2 octave-forge.spec, 1.16, 1.17

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge-2006.01.28.patch octave-forge.spec 
Log Message:
Fix permissions on octlink.sh and do some more patching.

octave-forge-2006.01.28.patch:

Index: octave-forge-2006.01.28.patch
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge-2006.01.28.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- octave-forge-2006.01.28.patch	3 Feb 2006 17:21:39 -0000	1.1
+++ octave-forge-2006.01.28.patch	3 Feb 2006 21:56:39 -0000	1.2
@@ -44,3 +44,17 @@
 +%.m: %.m.in
 +	-$(INSTALL) $< $@
 +
+Index: main/image/Makefile
+===================================================================
+diff -ruP octave-forge-2006.01.28.orig/main/image/Makefile octave-forge-2006.01.28/main/image/Makefile
+--- main/image/Makefile	2006-01-06 23:11:58.000000000 -0600
++++ main/image/Makefile	2006-02-03 15:34:38.000000000 -0600
+@@ -9,7 +9,7 @@
+ endif
+ 
+ ifdef HAVE_MAGICKXX
+-	IMAGEMAGICK=__imagemagick__.oct __magick_read__.oct
++	IMAGEMAGICK=__imagemagick__.oct __magick_read__$(OCTLINK)
+ endif
+ 
+ all: conv2.oct cordflt2.oct bwlabel.oct bwfill.oct rotate_scale.oct \


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- octave-forge.spec	3 Feb 2006 18:45:43 -0000	1.16
+++ octave-forge.spec	3 Feb 2006 21:56:39 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.01.28
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -36,6 +36,7 @@
 %patch0 -p0
 # The sparse matrix functions are in octave 2.9.x so don't install them
 touch main/sparse/NOINSTALL
+chmod +x admin/octlink.sh
 
 %build
 export CPPFLAGS=-I%{_includedir}/netcdf-3
@@ -69,6 +70,9 @@
 
 
 %changelog
+* Fri Feb  3 2006 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-3
+- Fix permissions on octlink.sh and add more to the patch.
+
 * Fri Feb  3 2006 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-2
 - Add new build dependencies on ImageMagick-c++-devel and netcdf-devel.
   (The ImageMagick-c++-devel indirectly brings in the necessary