rpms/octave-forge/FC-4 octave-forge-2006.01.28.patch, NONE, 1.1 octave-forge.spec, 1.20, 1.21

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22855

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-2006.01.28.patch 
Log Message:
Patch to fix some files that weren't installed.

octave-forge-2006.01.28.patch:

--- NEW FILE octave-forge-2006.01.28.patch ---
Index: admin/octlink.sh
===================================================================
diff -ruP octave-forge-2006.01.28.orig/admin/octlink.sh octave-forge-2006.01.28/admin/octlink.sh
--- admin/octlink.sh	1969-12-31 18:00:00.000000000 -0600
+++ admin/octlink.sh	2006-02-01 04:07:10.000000000 -0600
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+FN2=`echo $2 | sed -e's/.octlink//'`
+FN1=`echo $1 | sed -e's/.oct//'`
+if test -e $2 ; then /bin/rm $2; fi
+echo "autoload (\"$FN2\", which (\"$FN1\"));" > $2
Index: main/general/Makefile
===================================================================
diff -ruP octave-forge-2006.01.28.orig/main/general/Makefile octave-forge-2006.01.28/main/general/Makefile
--- main/general/Makefile	2006-01-11 14:57:22.000000000 -0600
+++ main/general/Makefile	2006-02-03 10:24:03.000000000 -0600
@@ -6,8 +6,8 @@
 t2.9.0=isequal.m sortrows.m
 t2.9.4=blkdiag.m
 DEPRECIATED_TARGETS=$($(word 2, $(sort t$(OCTAVE_VERSION) t2.1.58))) \
-	$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0)) \
-	$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.4))
+	$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0))) \
+	$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.4)))
 PROGS=$(DEPRECIATED_TARGETS) command.oct deref.oct mark_for_deletion.oct
 
 all: $(PROGS)
Index: main/set/Makefile
===================================================================
diff -ruP octave-forge-2006.01.28.orig/main/set/Makefile octave-forge-2006.01.28/main/set/Makefile
--- main/set/Makefile	1969-12-31 18:00:00.000000000 -0600
+++ main/set/Makefile	2006-02-03 07:08:16.000000000 -0600
@@ -0,0 +1,12 @@
+sinclude ../../Makeconf
+
+t2.9.0=ismember.m setdiff.m unique.m
+DEPRECIATED_TARGETS=$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0)))
+
+all : $(DEPRECIATED_TARGETS)
+
+clean: ; -$(RM) core octave-core $(DEPRECIATED_TARGETS) *~
+
+%.m: %.m.in
+	-$(INSTALL) $< $@
+


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- octave-forge.spec	30 Jan 2006 16:00:43 -0000	1.20
+++ octave-forge.spec	3 Feb 2006 17:12:03 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.01.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -15,6 +15,7 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
+Patch0:         octave-forge-2006.01.28.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       octave >= 2.1.69 ImageMagick
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -65,6 +67,9 @@
 
 
 %changelog
+* Fri Feb  3 2006 Quentin Spencer <qspencer at users.sf.net> 2001.01.28-2
+- Patch to fix some files that were not installed.
+
 * Mon Jan 30 2006 Quentin Spencer <qspencer at users.sf.net> 2001.01.28-1
 - New release. Remove old patch.
 - Change installation paths so they now depend on the octave API version