rpms/plplot/devel plplot.spec,1.9,1.10

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9160

Modified Files:
	plplot.spec 
Log Message:
- Update to 5.6.0 with new psttf driver
- Add wxGTK support



Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plplot.spec	24 Feb 2006 22:04:56 -0000	1.9
+++ plplot.spec	8 May 2006 18:26:41 -0000	1.10
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           plplot
-Version:        5.5.3
-Release:        12%{?dist}
+Version:        5.6.0
+Release:        1%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -11,11 +11,9 @@
 Source0:        http://prdownloads.sf.net/plplot/%{name}-%{version}.tar.gz
 Patch0:         plplot-5.5.3-matwrap.patch
 Patch1:         plplot-5.5.3-tk.patch
-Patch2:         plplot-5.5.3-buffer.patch
 Patch3:         plplot-5.5.3-x86_64.patch
 Patch4:         plplot-5.5.3-octave.patch
-Patch5:         plplot-5.5.3-check.patch
-Patch6:         plplot-5.5.3-x.patch
+Patch6:         plplot-5.6.0-x.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, freetype-devel, octave-devel, qhull-devel
@@ -24,9 +22,10 @@
 BuildRequires:  python-devel, pygtk2-devel, python-numeric
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
 BuildRequires:  perl(XML::DOM)
-#Temporary until bz #176313 is fixed
-BuildRequires:  libXau-devel, libXdmcp-devel
-#BuildRequires: libunicode-devel
+BuildRequires:  lasi-devel
+BuildRequires:  wxGTK-devel
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 PLplot is a library of functions that are useful for making scientific
@@ -127,14 +126,22 @@
 %description    tk-devel
 %{summary}
 
+
+%package        wxGTK
+Summary:        Functions for scientific plotting with wxGTK
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    wxGTK
+%{summary}
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .orig
 %patch1 -p1 -b .orig
-%patch2 -p1 -b .orig
 %patch3 -p1 -b .orig
 %patch4 -p1 -b .orig
-%patch5 -p1 -b .orig
 %patch6 -p1 -b .orig
 
 
@@ -142,7 +149,8 @@
 %configure --disable-static --without-rpath --with-pthreads \
            --with-freetype-font-dir=/usr/share/fonts \
            --with-libunicode=no --disable-cgm --disable-linuxvga \
-           --disable-wingcc --disable-aqt --disable-pdl
+           --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \
+           --with-prebuiltdoc
 make
 
 
@@ -155,8 +163,6 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version}
 find $RPM_BUILD_ROOT -name \*.la | xargs rm
-#Remove non-existant PDL dependency
-rm -r $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/perl
 #Permissions
 find $RPM_BUILD_ROOT%{_docdir} -type f | xargs chmod -x
 
@@ -165,7 +171,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+/sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/plplotdoc.info %{_infodir}/dir || :
+fi
 
 %postun -p /sbin/ldconfig
 
@@ -214,6 +227,8 @@
 %{_libdir}/plplot%{version}/driversd/ps.so
 %{_libdir}/plplot%{version}/driversd/pstex.rc
 %{_libdir}/plplot%{version}/driversd/pstex.so
+%{_libdir}/plplot%{version}/driversd/psttf.rc
+%{_libdir}/plplot%{version}/driversd/psttf.so
 %{_libdir}/plplot%{version}/driversd/xfig.rc
 %{_libdir}/plplot%{version}/driversd/xfig.so
 %{_libdir}/plplot%{version}/driversd/xwin.rc
@@ -229,6 +244,7 @@
 %{python_sitelib}/plplotcanvas.py
 %{python_sitelib}/plplotcanvas.pyc
 %{python_sitelib}/plplotcanvas.pyo
+%{_infodir}/plplotdoc.info*
 %{_mandir}/man1/plm2gif.1.gz
 %{_mandir}/man1/plpr.1.gz
 %{_mandir}/man1/plrender.1.gz
@@ -264,6 +280,7 @@
 %{_datadir}/plplot%{version}/examples/test_c.sh
 %{_datadir}/plplot%{version}/examples/test_cxx.sh
 %{_datadir}/plplot%{version}/examples/test_f77.sh
+%{_mandir}/man3/pl*.3*
 
 %files gnome
 %defattr(-,root,root,-)
@@ -315,7 +332,17 @@
 %{_datadir}/plplot%{version}/examples/tcl/
 %{_datadir}/plplot%{version}/examples/tk/
 
+%files wxGTK
+%defattr(-,root,root,-)
+%{_libdir}/plplot%{version}/driversd/wxwidgets.rc
+%{_libdir}/plplot%{version}/driversd/wxwidgets.so
+
+
 %changelog
+* Mon Apr 24 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.0-1
+- Update to 5.6.0 with new psttf driver
+- Add wxGTK support
+
 * Fri Feb 24 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-12
 - Rebuild for FC5 gcc/glibc changes