rpms/plplot/FC-4 plplot-5.5.3-octave.patch, NONE, 1.1 plplot-5.5.3-x86_64.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 plplot.spec, 1.3, 1.4 sources, 1.4, 1.5 plplot-5.5.3-buffer.patch, 1.1, NONE

Orion Poplawski (orion) fedora-extras-commits at redhat.com
Tue May 9 17:57:10 UTC 2006 

Author: orion

Update of /cvs/extras/rpms/plplot/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22879

Modified Files:
	.cvsignore plplot.spec sources 
Added Files:
	plplot-5.5.3-octave.patch plplot-5.5.3-x86_64.patch 
Removed Files:
	plplot-5.5.3-buffer.patch 
Log Message:
- Update to 5.6.0 with new psttf driver
- Add wxGTK support


plplot-5.5.3-octave.patch:

--- NEW FILE plplot-5.5.3-octave.patch ---
--- plplot-5.5.3/bindings/octave/PLplot/figure.m.orig	2005-08-10 11:56:53.000000000 -0600
+++ plplot-5.5.3/bindings/octave/PLplot/figure.m	2005-08-10 12:00:39.000000000 -0600
@@ -49,9 +49,10 @@
 
   if (!exist("__pl") || !struct_contains (__pl,"inited"))
     v = split(version ,'.');
-    if (! (str2num(v(1,:)) >= 2 &&
-           str2num(v(2,:)) >= 1 &&
-           str2num(v(3,:)) >= 57))
+    if (! ((str2num(v(1,:)) > 2) ||
+           (str2num(v(1,:)) == 2 && str2num(v(2,:)) > 1) ||
+           (str2num(v(1,:)) == 2 && str2num(v(2,:)) == 1 &&
+            str2num(v(3,:)) >= 57)))
         error("The PLplot-Octave scripts need an Octave version \n\
         greater then or equal to 2.1.57.\n");
     endif

plplot-5.5.3-x86_64.patch:

--- NEW FILE plplot-5.5.3-x86_64.patch ---
--- plplot-5.5.3/cf/tcl.ac.orig	2005-08-10 11:46:11.000000000 -0600
+++ plplot-5.5.3/cf/tcl.ac	2005-08-10 11:46:47.000000000 -0600
@@ -78,6 +78,7 @@
 $HOME/local/lib \
 $HOME/lib \
 /usr/local/lib \
+/usr/lib64 \
 /usr/lib"
 
 incdirs=$incdirs_default


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Aug 2005 21:36:20 -0000	1.4
+++ .cvsignore	9 May 2006 17:57:10 -0000	1.5
@@ -1,4 +1 @@
-plplot-5.5.3.tar.gz
-plplot-5.5.3-x86_64.patch
-plplot-5.5.3-octave.patch
-plplot-5.5.3-check.patch
+plplot-5.6.0.tar.gz


Index: plplot.spec
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-4/plplot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plplot.spec	11 Aug 2005 21:36:20 -0000	1.3
+++ plplot.spec	9 May 2006 17:57:10 -0000	1.4
@@ -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:        7%{?dist}
+Version:        5.6.0
+Release:        1%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -11,13 +11,10 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  autoconf
 BuildRequires:  gcc-gfortran, freetype-devel, octave-devel, qhull-devel
 %ifarch %{ix86} x86_64
 BuildRequires:  java-devel, libgcj-devel
@@ -29,7 +26,10 @@
 BuildRequires:  python-devel, pygtk2-devel, python-numeric
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2
 BuildRequires:  perl(XML::DOM)
-#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
@@ -62,7 +62,7 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-%{summary}
+%{summary}.
 
 
 %package        gnome
@@ -71,7 +71,7 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description    gnome
-%{summary}
+%{summary}.
 
 %package        gnome-devel
 Summary:        Development files for using PLplot GNOME
@@ -81,7 +81,7 @@
 Requires:       %{name}-gnome = %{version}-%{release}
 
 %description    gnome-devel
-%{summary}
+%{summary}.
 
 
 %ifarch %{ix86} x86_64
@@ -91,7 +91,7 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description    java
-%{summary}
+%{summary}.
 
 %package        java-devel
 Summary:        Development files for using PLplot GNOME
@@ -101,7 +101,7 @@
 Requires:       %{name}-java = %{version}-%{release}
 
 %description    java-devel
-%{summary}
+%{summary}.
 %endif
 
 
@@ -111,7 +111,7 @@
 Requires:       %{name} = %{version}-%{release}, octave
 
 %description    octave
-%{summary}
+%{summary}.
 
 
 %package        tk
@@ -120,7 +120,7 @@
 Requires:       %{name} = %{version}-%{release}
 
 %description    tk
-%{summary}
+%{summary}.
 
 %package        tk-devel
 Summary:        Development files for using PLplot with Tk
@@ -130,24 +130,32 @@
 Requires:       %{name}-tk = %{version}-%{release}
 
 %description    tk-devel
-%{summary}
+%{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
 
 
 %build
-autoconf
 %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 %{java_config}
+           --disable-wingcc --disable-aqt --disable-pdl --enable-psttf \
+           --with-prebuiltdoc %{java_config}
 make
 
 
@@ -160,8 +168,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
 
@@ -170,7 +176,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
 
@@ -219,6 +232,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
@@ -228,6 +243,7 @@
 %{python_sitelib}/plplot_widgetmodule.so
 %{python_sitelib}/plplotc.py
 %{python_sitelib}/plplotcanvas.py
+%{_infodir}/plplotdoc.info*
 %{_mandir}/man1/plm2gif.1.gz
 %{_mandir}/man1/plpr.1.gz
 %{_mandir}/man1/plrender.1.gz
@@ -263,6 +279,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,-)
@@ -316,7 +333,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
+* Tue May  9 2006 - Orion Poplawski <orion at cora.nwra.com> - 5.6.0-1
+- Update to 5.6.0 with new psttf driver
+- Add wxGTK support
+
 * Thu Aug 11 2005 - Orion Poplawski <orion at cora.nwra.com> - 5.5.3-7
 - Breakout java into its own sub-package, don't build on non x86
 - Add patch to use new octave in devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plplot/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Aug 2005 21:36:20 -0000	1.4
+++ sources	9 May 2006 17:57:10 -0000	1.5
@@ -1,4 +1 @@
-6df3d63cffac28337ff7fa56712da5c7  plplot-5.5.3.tar.gz
-02cc9f8eb72211581aae2bd38670252f  plplot-5.5.3-x86_64.patch
-7970faa7d90fe1e98e19354fd607a309  plplot-5.5.3-octave.patch
-22f2761b863bf1f47fb37b7d7fb9ab85  plplot-5.5.3-check.patch
+0f23cc477f0611adcfdd8ba39caf4213  plplot-5.6.0.tar.gz


--- plplot-5.5.3-buffer.patch DELETED ---

More information about the scm-commits mailing list