rpms/octave-forge/devel octave-forge-2006.01.28.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 octave-forge.spec, 1.14, 1.15 sources, 1.4, 1.5 octave-forge-2005.06.13-legend.patch, 1.1, NONE

Fri Feb 3 17:21:39 UTC 2006

Author: qspencer

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

Modified Files:
	.cvsignore octave-forge.spec sources 
Added Files:
	octave-forge-2006.01.28.patch 
Removed Files:
	octave-forge-2005.06.13-legend.patch 
Log Message:
New upstream sources. Several specfile changes.

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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jun 2005 13:31:52 -0000	1.4
+++ .cvsignore	3 Feb 2006 17:21:39 -0000	1.5
@@ -1 +1 @@
-octave-forge-2005.06.13.patched.tar.gz
+octave-forge-2006.01.28.patched.tar.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- octave-forge.spec	2 Nov 2005 14:23:51 -0000	1.14
+++ octave-forge.spec	3 Feb 2006 17:21:39 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           octave-forge
-Version:        2005.06.13
-Release:        5%{?dist}
+Version:        2006.01.28
+Release:        1%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -15,15 +15,10 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
-Patch0:         %{name}-2005.06.13-legend.patch
+Patch0:         %{name}-2006.01.28.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
-## Octave-forge installs in a directory tree specific to the installed
-## version of octave, so the following version dependency is necessary.
-%define octave_ep  6
-%define octave_ver %(echo "disp(octave_config_info.version)" | octave -qf)
-Requires:	octave = %{octave_ep}:%{octave_ver} ImageMagick
+Requires:	octave >= 2.9.4 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel
 BuildRequires:  xorg-x11-devel libjpeg-devel libpng-devel pcre-devel
 BuildRequires:  ncurses-devel libtermcap-devel gsl-devel qhull-devel
@@ -39,6 +34,8 @@
 %prep
 %setup -q
 %patch0 -p0
+# The sparse matrix functions are in octave 2.9.x so don't install them
+touch main/sparse/NOINSTALL
 
 %build
 %configure
@@ -46,17 +43,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%define host_type %(echo "disp(octave_config_info('canonical_host_type'))" | octave -qf)
-%define site_dir octave/%{octave_ver}/site
-make install prefix=$RPM_BUILD_ROOT%{_prefix} \
-	bindir=$RPM_BUILD_ROOT%{_bindir} \
-	mandir=$RPM_BUILD_ROOT%{_mandir} \
-	MPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/m/octave-forge \
-	OPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/oct/%{host_type}/octave-forge \
-	XPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/exec/%{host_type} \
-	ALTPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/octave-forge-alternative/m \
-	ALTMPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/octave-forge-alternative/m/octave-forge \
-	ALTOPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/octave-forge-alternative/oct/%{host_type}
+ALTPATHNAME=octave/site/octave-forge-alternative
+HOSTTYPE=`octave-config -p CANONICAL_HOST_TYPE`
+%makeinstall \
+  MPATH=$RPM_BUILD_ROOT`octave-config -p LOCALFCNFILEDIR`/octave-forge \
+  OPATH=$RPM_BUILD_ROOT`octave-config -p LOCALAPIOCTFILEDIR`/octave-forge \
+  XPATH=$RPM_BUILD_ROOT`octave-config -p LOCALARCHLIBDIR`/octave-forge \
+  ALTPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m \
+  ALTMPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m/octave-forge \
+  ALTOPATH=$RPM_BUILD_ROOT%{_libexecdir}/$ALTPATHNAME/oct/$HOSTTYPE
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,6 +68,12 @@
 
 
 %changelog
+* Fri Feb  3 2006 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-1
+- New upstream release.
+- Patch so it will build correctly with octave 2.9.x.
+- Change installation paths so they now depend on the octave API version
+  rather than the octave version, which will make updates less frequent.
+
 * Wed Nov  2 2005 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-5
 - Rebuild for new versions of ginac and cln.
 - Query octave to get octave version dependency.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jun 2005 13:31:52 -0000	1.4
+++ sources	3 Feb 2006 17:21:39 -0000	1.5
@@ -1 +1 @@
-460aecb7aa96689901bd96a04e55fb40  octave-forge-2005.06.13.patched.tar.gz
+8192ee6bc3784e35180623592de4303f  octave-forge-2006.01.28.patched.tar.gz


--- octave-forge-2005.06.13-legend.patch DELETED ---


