rpms/octave-forge/devel octave-forge.spec,1.1,1.2

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge.spec 
Log Message:
Changed license (it turns out the collection is actually licensed in the
public domain, rather than GPL, due to the fact that it includes a few 
functions that are BSD or public domain).  Moved the ugly path hacks
that are necessary for getting it to install properly to the make install
command and out of the configure command.



Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- octave-forge.spec	21 Apr 2005 16:20:02 -0000	1.1
+++ octave-forge.spec	25 Apr 2005 14:09:21 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           octave-forge
 Version:        2004.11.16
-Release:        6
-Summary:        Additional packages for octave
+Release:        7
+Summary:        Additional functions for octave
 
 Group:          Applications/Engineering
-License:        GPL
+License:        Public Domain
 URL:            http://octave.sourceforge.net
 Source0:        %{url}/cgi-bin/viewcvs.cgi/octave/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -33,23 +33,22 @@
 %build
 LC_ALL=POSIX
 export LC_ALL
-%define host_type %(echo "disp(octave_config_info('canonical_host_type'))" | octave -qf)
-%define site_dir octave/%{octave_ver}/site
-## The paths are hardcoded by configure, so this ugly configure command
-## is necessary to get them to install in the right places.
-./configure --with-x --prefix=$RPM_BUILD_ROOT%{_prefix} \
-	--mandir=$RPM_BUILD_ROOT%{_mandir} --libdir=%{_libdir} \
-	--with-mpath=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/m/octave-forge \
-	--with-opath=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/oct/%{host_type}/octave-forge \
-	--with-xpath=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/exec/%{host_type} \
-	--with-altpath=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/octave-forge-alternative/m \
-	--with-altmpath=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/octave-forge-alternative/m/octave-forge \
-	--with-altopath=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/octave-forge-alternative/oct/%{host_type}
+%configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install 
+%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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +65,12 @@
 
 
 %changelog
+* Mon Apr 25 2005 Quentin Spencer <qspencer at users.sf.net> 2004.11.16-7
+- Changed license (some functions are GPL, some are public domain,
+  so the collection is licensed as public domain).
+- Moved ugly path hacks from build to install so that RPM_BUILD_ROOT
+  doesn't end up in the code (which it did before).
+
 * Thu Apr 21 2005 Quentin Spencer <qspencer at users.sf.net> 2004.11.16-6
 - Added GiNaC-devel BuildRequires