SPECS: octave-forge.spec - use macros

[glen]

Author: glen                         Date: Wed Mar 12 14:12:00 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use macros

---- Files affected:
SPECS:
   octave-forge.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/octave-forge.spec
diff -u SPECS/octave-forge.spec:1.15 SPECS/octave-forge.spec:1.16
--- SPECS/octave-forge.spec:1.15	Fri Dec  7 23:23:55 2007
+++ SPECS/octave-forge.spec	Wed Mar 12 15:11:55 2008
@@ -25,6 +25,9 @@
 BuildRequires:	qhull-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		octave_m_site_dir %(octave-config --m-site-dir 2>/dev/null)
+%define		octave_oct_site_dir %(octave-config --oct-site-dir 2>/dev/null)
+
 %description
 Set of custom scripts, functions and extensions for GNU Octave.
 octave-forge (http://octave.sf.net/) is a community project for
@@ -44,8 +47,8 @@
 %setup -q -n %{name}-bundle-%{version}
 
 %build
-CFLAGS="%{rpmcflags} -I/usr/include/ncurses" ; export CFLAGS
-for d in main extras ; do
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses"; export CFLAGS
+for d in main extras; do
 	cd $d
 	for pkg in *.tar.gz ; do
 		P=${pkg%%.tar.gz}
@@ -71,11 +74,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	MPATH="$RPM_BUILD_ROOT$( octave-config --m-site-dir )/%{name}" \
-	OPATH="$RPM_BUILD_ROOT$( octave-config --oct-site-dir )/%{name}" \
-	XPATH="$RPM_BUILD_ROOT$( octave-config --oct-site-dir )" \
-	ALTMPATH="$RPM_BUILD_ROOT$( octave-config --m-site-dir )/%{name}" \
-	ALTOPATH="$RPM_BUILD_ROOT$( octave-config --oct-site-dir )/%{name}" \
+	MPATH="$RPM_BUILD_ROOT%{octave_m_site_dir}/%{name}" \
+	OPATH="$RPM_BUILD_ROOT%{octave_oct_site_dir}/%{name}" \
+	XPATH="$RPM_BUILD_ROOT%{octave_oct_site_dir}" \
+	ALTMPATH="$RPM_BUILD_ROOT%{octave_m_site_dir}/%{name}" \
+	ALTOPATH="$RPM_BUILD_ROOT%{octave_oct_site_dir}/%{name}" \
 	mandir="$RPM_BUILD_ROOT%{_mandir}" \
 	bindir="$RPM_BUILD_ROOT%{_bindir}"
 find $RPM_BUILD_ROOT -name PKG_ADD -print0 | xargs -0 rm -f
@@ -89,7 +92,7 @@
 if [ -f "%{_datadir}/octave/site/m/startup/octaverc" ] && \
 	! grep -q "octave-forge" "%{_datadir}/octave/site/m/startup/octaverc"
 then
-	echo "LOADPATH = [ '$( octave-config --oct-site-dir)/octave-forge:$( octave-config --m-site-dir)/octave-forge/:', LOADPATH ];" >> "%{_datadir}/octave/site/m/startup/octaverc"
+	echo "LOADPATH = [ '%{octave_oct_site_dir}/octave-forge:%{octave_m_site_dir}/octave-forge/:', LOADPATH ];" >> "%{_datadir}/octave/site/m/startup/octaverc"
 fi
 
 %postun
@@ -106,12 +109,12 @@
 %doc doc/coda/oct/*.sgml doc/coda/standalone/*.sgml
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man*/*
-%(octave-config --m-site-dir)/%{name}
-%dir %(octave-config --oct-site-dir)/%{name}
-%(octave-config --oct-site-dir)/%{name}/*.[ho]
-%attr(755,root,root) %(octave-config --oct-site-dir)/%{name}/*.oct
-%attr(755,root,root) %(octave-config --oct-site-dir)/aurecord
-%attr(755,root,root) %(octave-config --oct-site-dir)/rasmol.sh
+%{octave_m_site_dir}/%{name}
+%dir %{octave_oct_site_dir}/%{name}
+%{octave_oct_site_dir}/%{name}/*.[ho]
+%attr(755,root,root) %{octave_oct_site_dir}/%{name}/*.oct
+%attr(755,root,root) %{octave_oct_site_dir}/aurecord
+%attr(755,root,root) %{octave_oct_site_dir}/rasmol.sh
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -119,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2008-03-12 14:11:55  glen
+- use macros
+
 Revision 1.15  2007-12-07 22:23:55  baggins
 - first attempt at new build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/octave-forge.spec?r1=1.15&r2=1.16&f=u