rpms/plplot/devel plplot-5.7.4-info.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 plplot.spec, 1.36, 1.37 sources, 1.9, 1.10 plplot-5.6.1-info.patch, 1.1, NONE plplot-5.7.3-svn.patch, 1.2, NONE

[Orion Poplawski (orion)]

Author: orion

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

Modified Files:
	.cvsignore plplot.spec sources 
Added Files:
	plplot-5.7.4-info.patch 
Removed Files:
	plplot-5.6.1-info.patch plplot-5.7.3-svn.patch 
Log Message:
* Thu Aug 23 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-2
- Rebuild for BuildID


plplot-5.7.4-info.patch:

--- NEW FILE plplot-5.7.4-info.patch ---
--- plplot-5.7.4/doc/docbook/src/plplotdoc.info.orig	2007-08-13 18:37:14.000000000 -0600
+++ plplot-5.7.4/doc/docbook/src/plplotdoc.info	2007-08-14 10:10:57.000000000 -0600
@@ -3,8 +3,9 @@
 produced by makeinfo version 4.8 from
 /tmp/plplot-dist-prep/build_dir/doc/docbook/src/plplotdoc.texi.
 
+INFO-DIR-SECTION Scientific Visualization
 START-INFO-DIR-ENTRY
-* The PLplot Plotting Library: .   The PLplot Plotting Library
+* PLplot: (plplotdoc).               The PLplot Plotting Library.
 END-INFO-DIR-ENTRY
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	26 Mar 2007 18:44:11 -0000	1.9
+++ .cvsignore	23 Aug 2007 16:05:22 -0000	1.10
@@ -1 +1 @@
-plplot-5.7.3.tar.gz
+plplot-5.7.4.tar.gz


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- plplot.spec	8 Aug 2007 22:53:18 -0000	1.36
+++ plplot.spec	23 Aug 2007 16:05:22 -0000	1.37
@@ -4,8 +4,8 @@
 %{!?with_octave:%define with_octave 0}
 
 Name:           plplot
-Version:        5.7.3
-Release:        4%{?dist}
+Version:        5.7.4
+Release:        2%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -13,16 +13,15 @@
 URL:            http://plplot.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
 Patch1:         plplot-5.6.1-octave.patch
-Patch2:         plplot-5.6.1-info.patch
+Patch2:         plplot-5.7.4-info.patch
 Patch5:         plplot-5.7.2-multilib.patch
 Patch6:         plplot-5.7.3-jni.patch
-Patch7:         plplot-5.7.3-svn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, libtool-ltdl-devel, swig
 BuildRequires:  gcc-gfortran
 # Ada is not available on ppc64 and not working on x86_64
-%ifnarch x86_64 ppc64
+%ifnarch ppc64
 BuildRequires:  gcc-gnat
 %define build_ada -DENABLE_ada:BOOL=ON
 %else
@@ -40,6 +39,7 @@
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2-devel
 BuildRequires:  perl(XML::DOM), lasi-devel, wxGTK-devel, agg-devel
 BuildRequires:  freefont
+BuildRequires:  perl(PDL::Graphics::PLplot)
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
 %endif
@@ -194,7 +194,6 @@
 %patch2 -p1 -b .orig
 %patch5 -p1 -b .multilib
 %patch6 -p1 -b .jni
-%patch7 -p1 -b .svn
 
 
 %build
@@ -205,6 +204,8 @@
 export FFLAGS="$RPM_OPT_FLAGS"
 %cmake .. \
 	%{build_ada} \
+	-DENABLE_pdl:BOOL=ON \
+	-DHAVE_PTHREAD:BOOL=ON \
 	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
 	-DPLD_aqt:BOOL=ON \
 	-DPLD_conex:BOOL=ON \
@@ -393,7 +394,7 @@
 %{_datadir}/plplot%{version}/examples/f77/
 %{_datadir}/plplot%{version}/examples/f95/
 %{_datadir}/plplot%{version}/examples/Makefile
-%ifnarch x86_64 ppc64
+%ifnarch ppc64
 %{_datadir}/plplot%{version}/examples/test_ada.sh
 %endif
 %{_datadir}/plplot%{version}/examples/test_c.sh
@@ -468,6 +469,15 @@
 %{_libdir}/pkgconfig/plplotd-wxwidgets.pc
 
 %changelog
+* Thu Aug 23 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-2
+- Rebuild for BuildID
+
+* Tue Aug 14 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.4-1
+- Update to 5.7.4
+- Re-enable ada on x86_64
+- Enable PDL tests
+- Set HAVE_PTHREAD for the xwin driver
+
 * Wed Aug  8 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-4
 - BR numpy rather than python-numeric - doesn't do anything yet?
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	26 Mar 2007 18:44:11 -0000	1.9
+++ sources	23 Aug 2007 16:05:22 -0000	1.10
@@ -1 +1 @@
-8c5ed411bc63a4fd07b362a1b9a3e46c  plplot-5.7.3.tar.gz
+960fd580ef327dbb98539d690f83e313  plplot-5.7.4.tar.gz


--- plplot-5.6.1-info.patch DELETED ---


--- plplot-5.7.3-svn.patch DELETED ---