SPECS: plplot.spec - fixed octave dirs

[qboosh]

Author: qboosh                       Date: Mon May 12 21:41:08 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed octave dirs

---- Files affected:
SPECS:
   plplot.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/plplot.spec
diff -u SPECS/plplot.spec:1.32 SPECS/plplot.spec:1.33
--- SPECS/plplot.spec:1.32	Wed Apr 23 10:49:53 2008
+++ SPECS/plplot.spec	Mon May 12 23:41:03 2008
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - fix -octave dirs
 #
 # Conditional build:
 %bcond_without	gnome		# don't build gnome driver
@@ -32,10 +30,9 @@
 BuildRequires:	freetype-devel >= 2.1.0
 BuildRequires:	gcc-g77
 BuildRequires:	gd-devel
-%{?with_gnome:BuildRequires:	libgnomeui-devel}
-%{?with_gnome:BuildRequires:	libgnomeprintui-devel}
+%{?with_gnome:BuildRequires:	libgnomeui-devel >= 2.0}
+%{?with_gnome:BuildRequires:	libgnomeprintui-devel >= 2.2}
 %{?with_gnome:BuildRequires:	libgnomecanvas-devel}
-%{?with_gnome:BuildRequires:	python-gnome-devel}
 BuildRequires:	itcl-devel
 BuildRequires:	jadetex
 %{?with_java:BuildRequires:	jdk}
@@ -48,9 +45,11 @@
 BuildRequires:	perl-XML-SAX-Expat
 BuildRequires:	perl-XML-Parser
 BuildRequires:	perl-XML-DOM
+BuildRequires:	pkgconfig
 BuildRequires:	python-Numeric-devel >= 15.3
 BuildRequires:	python-devel >= 1:2.3
-BuildRequires:	python-pygtk-devel >= 2.12.1
+%{?with_gnome:BuildRequires:	python-gnome-devel >= 2.0}
+BuildRequires:	python-pygtk-devel >= 2:2.12.1
 BuildRequires:	qhull-devel
 BuildRequires:	sed >= 4.0
 %{?with_svga:BuildRequires:	svgalib-devel}
@@ -62,6 +61,8 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_ulibdir	%{_prefix}/lib
+%define		octave_oct_sitedir	%(octave-config --oct-site-dir)
+%define		octave_m_sitedir	%(octave-config --m-site-dir)
 
 %description
 PLplot is a library of functions that are useful for making scientific
@@ -499,14 +500,18 @@
 	--with-pkg-config \
 	--with-pthreads
 
-%{__make} -j1
+%{__make} -j1 \
+	OCTAVE_M_DIR=%{octave_m_sitedir} \
+	OCTAVE_OCT_DIR=%{octave_oct_sitedir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	OCTAVE_M_DIR=%{octave_m_sitedir} \
+	OCTAVE_OCT_DIR=%{octave_oct_sitedir}
 
 mv -f $RPM_BUILD_ROOT%{_libdir}/plplot%{version}/data/examples \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -788,13 +793,8 @@
 %files octave
 %defattr(644,root,root,755)
 %doc bindings/octave/{BUGS,FGA,README,ToDo,USAGE,plplot_octave_txt}
-/usr/lib64/octave/site/oct/x86_64-pld-linux-gnu
-# XXX error: plplot-octave-5.8.0-1: req /usr/lib64/octave/site/oct/x86_64-pld-linux-gnu not found
-# 11:35:25 glen[pts/25]@carme-pld rpm/SPECS$ ql octave|grep /usr/lib64/octave/site/
-#/usr/lib64/octave/site/exec
-#/usr/lib64/octave/site/exec/x86_64-pld-linux-gnu
-%attr(755,root,root) %{_libdir}/octave/*/oct/*/plplot_octave.oct
-%{_datadir}/octave/site/m/PLplot
+%attr(755,root,root) %{octave_oct_sitedir}/plplot_octave.oct
+%{octave_m_sitedir}/PLplot
 %{_datadir}/plplot_octave
 
 %files octave-examples
@@ -820,6 +820,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2008-05-12 21:41:03  qboosh
+- fixed octave dirs
+
 Revision 1.32  2008-04-23 08:49:53  glen
 - -octave dirdeps broken
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/plplot.spec?r1=1.32&r2=1.33&f=u