rpms/octave-forge/FC-4 .cvsignore, 1.4, 1.5 octave-forge.spec, 1.19, 1.20 sources, 1.4, 1.5 octave-forge-2005.06.13-legend.patch, 1.1, NONE

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	.cvsignore octave-forge.spec sources 
Removed Files:
	octave-forge-2005.06.13-legend.patch 
Log Message:
New upstream release & various specfile changes.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jun 2005 14:25:54 -0000	1.4
+++ .cvsignore	30 Jan 2006 16:00:43 -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/FC-4/octave-forge.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- octave-forge.spec	12 Nov 2005 01:53:50 -0000	1.19
+++ octave-forge.spec	30 Jan 2006 16:00:43 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           octave-forge
-Version:        2005.06.13
-Release:        11%{?dist}
+Version:        2006.01.28
+Release:        1%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -15,15 +15,9 @@
 ## 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
 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.1.69 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
@@ -38,8 +32,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
-echo %{octave_ver}
+
 
 %build
 %configure
@@ -47,17 +40,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
@@ -74,6 +65,11 @@
 
 
 %changelog
+* 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
+  rather than the octave version, which will make updates less frequent.
+
 * Fri Nov 11 2005 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-11
 - Rebuild for new version of octave (2.1.72).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jun 2005 14:25:54 -0000	1.4
+++ sources	30 Jan 2006 16:00:43 -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 ---