rpms/octave-forge/FC-4 octave-forge.spec,1.16,1.17

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge.spec 
Log Message:
Change octave version dependency to query octave rather than rpm.



Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- octave-forge.spec	5 Aug 2005 15:10:36 -0000	1.16
+++ octave-forge.spec	25 Oct 2005 14:39:39 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2005.06.13
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -21,8 +21,8 @@
 
 ## Octave-forge installs in a directory tree specific to the installed
 ## version of octave, so the following version dependency is necessary.
-%define octave_ep  %(rpm -q --qf '%%{epoch}' octave)
-%define octave_ver %(rpm -q --qf '%%{version}' octave)
+%define octave_ep  6
+%define octave_ver %(echo "disp(octave_config_info.version)" | octave -qf)
 Requires:	octave = %{octave_ep}:%{octave_ver} ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel
 BuildRequires:  xorg-x11-devel libjpeg-devel libpng-devel pcre-devel
@@ -39,6 +39,7 @@
 %prep
 %setup -q
 %patch0 -p0
+echo %{octave_ver}
 
 %build
 %configure
@@ -46,7 +47,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%define host_type %(echo "disp(octave_config_info('canonical_host_type'))" | octave -qf)
+%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} \
@@ -73,6 +74,9 @@
 
 
 %changelog
+* Tue Oct 25 2005 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-9
+- Change octave version dependency to query octave rather than rpm.
+
 * Fri Aug 05 2005 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-8
 - Rebuild for new version of ginac.