rpms/plplot/devel .cvsignore, 1.12, 1.13 plplot.spec, 1.56, 1.57 sources, 1.12, 1.13

Orion Poplawski orion at fedoraproject.org
Fri Sep 5 23:05:30 UTC 2008 

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31433

Modified Files:
	.cvsignore plplot.spec sources 
Log Message:
* Fri Sep 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.9.0-2.svn8752
- Update to svn revision 8752
- Add new gnome-python2 BRs
- Update build_doc BRs
- Add ocaml sub-package for OCaml interface
- Enable "D" interface.
- Re-enable psttfc test, disable perl and compare tests



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	11 Feb 2008 03:08:11 -0000	1.12
+++ .cvsignore	5 Sep 2008 23:04:59 -0000	1.13
@@ -1 +1,2 @@
 plplot-5.9.0.tar.gz
+plplot-5.9.0-svn8752.patch


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- plplot.spec	4 Mar 2008 19:59:26 -0000	1.56
+++ plplot.spec	5 Sep 2008 23:04:59 -0000	1.57
@@ -1,17 +1,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
-%{!?build_doc:%define build_doc 0}
+%{!?build_doc:%define build_doc 1}
 %{!?with_octave:%define with_octave 1}
 
 Name:           plplot
 Version:        5.9.0
-Release:        1%{?dist}
+Release:        2.svn8752%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
 License:        LGPLv2+
 URL:            http://plplot.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
+Patch0:         plplot-5.9.0-svn8752.patch
 Patch1:         plplot-5.8.0-multiarch.patch
 Patch2:         plplot-5.7.4-info.patch
 Patch6:         plplot-5.7.3-jni.patch
@@ -39,6 +40,7 @@
 BuildRequires:  itcl-devel, itk-devel
 BuildRequires:  python-devel, pygtk2-devel, numpy
 BuildRequires:  libgnomeui-devel, libgnomeprintui22-devel, gnome-python2-devel
+BuildRequires:  gnome-python2-canvas, gnome-python2-gnome
 BuildRequires:  perl(XML::DOM), lasi-devel, wxGTK-devel, agg-devel
 BuildRequires:  freefont
 BuildRequires:  perl(PDL::Graphics::PLplot)
@@ -46,8 +48,9 @@
 BuildRequires:  svgalib-devel
 %endif
 %if %{build_doc}
-BuildRequires:  docbook2X
+BuildRequires:  texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-dsssl
 %endif
+BuildRequires:  ocaml, ocaml-findlib, ocaml-camlidl-devel
 Requires(post): /sbin/ldconfig
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -162,6 +165,26 @@
 %{summary}.
 
 
+%package        ocaml
+Summary:        Functions for scientific plotting with OCaml
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Provides:       ocaml-plplot = %{version}-%{release}
+
+%description    ocaml
+%{summary}.
+
+
+%package        ocaml-devel
+Summary:        Development files for PLplot OCaml
+Group:          Development/Libraries
+Requires:       %{name}-ocaml = %{version}-%{release}
+Provides:       ocaml-plplot-devel = %{version}-%{release}
+
+%description    ocaml-devel
+%{summary}.
+
+
 %if %{with_octave}
 %package        octave
 Summary:        Functions for scientific plotting with Octave
@@ -225,6 +248,9 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .svn
+#Needed because of svn patch
+chmod +x plplot_test/*.sh* examples/tcl/x??
 %patch1 -p1 -b .multiarch
 %patch2 -p1 -b .orig
 %patch6 -p1 -b .jni
@@ -240,6 +266,9 @@
 unset TERM
 %cmake .. \
 	%{build_ada} \
+	-DENABLE_d:BOOL=ON \
+	-DENABLE_ocaml:BOOL=ON \
+	-DOCAML_INSTALL_DIR:PATH=`ocamlc -where` \
 	%{build_octave} \
 	-DENABLE_pdl:BOOL=ON \
 	-DHAVE_PTHREAD:BOOL=ON \
@@ -264,11 +293,14 @@
 	-DPLD_xterm:BOOL=ON \
 	-DPLD_wxwidgets:BOOL=ON \
 %if %{build_doc}
+	-DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
 	-DBUILD_DOC:BOOL=ON \
 %else
 	-DPREBUILT_DOC:BOOL=ON \
 %endif
 	-DBUILD_TEST:BOOL=ON
+# --debug-output --debug-trycompile \
+#
 make %{?_smp_flags} VERBOSE=1
 
 
@@ -276,7 +308,7 @@
 rm -rf $RPM_BUILD_ROOT
 cd fedora
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/%{_docdir}/plplot $RPM_BUILD_ROOT/%{_docdir}/plplot-%{version}
+mv $RPM_BUILD_ROOT%{_docdir}/plplot $RPM_BUILD_ROOT%{_docdir}/plplot-%{version}
 
 # Fix up tclIndex files so they are the same on all builds
 for file in $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples/*/tclIndex
@@ -291,8 +323,12 @@
 cd fedora
 #Hack
 export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
-# Exclude psttfc test for now
-ctest -V -E psttfc
+# Exclude perl and compare tests for now, and ocaml from ppc64
+%ifarch ppc64
+ctest -V -E 'compare|ocaml|perl'
+%else
+ctest -V -E 'compare|perl'
+%endif
 
 
 %clean
@@ -336,6 +372,37 @@
 %{_bindir}/plpr
 %{_bindir}/pltek
 %{_bindir}/pstex2eps
+%{python_sitearch}/_plplotcmodule.so
+%{python_sitearch}/plplot.py*
+%{python_sitearch}/plplot_widgetmodule.so
+%{python_sitearch}/plplotc.py*
+%{python_sitearch}/plplotcanvas.py*
+%{_infodir}/plplotdoc.info*
+%{_mandir}/man1/plm2gif.1.gz
+%{_mandir}/man1/plpr.1.gz
+%{_mandir}/man1/pltek.1.gz
+%{_mandir}/man1/pstex2eps.1.gz
+%dir %{_datadir}/plplot%{version}
+%{_datadir}/plplot%{version}/*.map
+%{_datadir}/plplot%{version}/*.fnt
+%{_datadir}/plplot%{version}/pkgIndex.tcl
+%{_datadir}/plplot%{version}/tcl/
+%dir %{_datadir}/plplot%{version}/examples
+%{_datadir}/plplot%{version}/examples/python/
+%{_datadir}/plplot%{version}/examples/test_python.sh
+%{_datadir}/plplot%{version}/examples/test_tcl.sh
+%{_datadir}/plplot%{version}/examples/plplot-test.sh
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libcsirocsa.so.*
+%{_libdir}/libcsironn.so.*
+%{_libdir}/libplplotcxxd.so.*
+%{_libdir}/libplplotd.so.*
+%{_libdir}/libplplotf77cd.so.*
+%{_libdir}/libplplotf77d.so.*
+%{_libdir}/libplplotf95cd.so.*
+%{_libdir}/libplplotf95d.so.*
 %dir %{_libdir}/plplot%{version}
 %dir %{_libdir}/plplot%{version}/driversd
 %{_libdir}/plplot%{version}/driversd/cairo.rc
@@ -378,37 +445,6 @@
 %{_libdir}/plplot%{version}/driversd/xfig.so
 %{_libdir}/plplot%{version}/driversd/xwin.rc
 %{_libdir}/plplot%{version}/driversd/xwin.so
-%{python_sitearch}/_plplotcmodule.so
-%{python_sitearch}/plplot.py*
-%{python_sitearch}/plplot_widgetmodule.so
-%{python_sitearch}/plplotc.py*
-%{python_sitearch}/plplotcanvas.py*
-%{_infodir}/plplotdoc.info*
-%{_mandir}/man1/plm2gif.1.gz
-%{_mandir}/man1/plpr.1.gz
-%{_mandir}/man1/pltek.1.gz
-%{_mandir}/man1/pstex2eps.1.gz
-%dir %{_datadir}/plplot%{version}
-%{_datadir}/plplot%{version}/*.map
-%{_datadir}/plplot%{version}/*.fnt
-%{_datadir}/plplot%{version}/pkgIndex.tcl
-%{_datadir}/plplot%{version}/tcl/
-%dir %{_datadir}/plplot%{version}/examples
-%{_datadir}/plplot%{version}/examples/python/
-%{_datadir}/plplot%{version}/examples/test_python.sh
-%{_datadir}/plplot%{version}/examples/test_tcl.sh
-%{_datadir}/plplot%{version}/examples/plplot-test.sh
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/libcsirocsa.so.*
-%{_libdir}/libcsironn.so.*
-%{_libdir}/libplplotcxxd.so.*
-%{_libdir}/libplplotd.so.*
-%{_libdir}/libplplotf77cd.so.*
-%{_libdir}/libplplotf77d.so.*
-%{_libdir}/libplplotf95cd.so.*
-%{_libdir}/libplplotf95d.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -430,11 +466,13 @@
 %{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/c/
 %{_datadir}/plplot%{version}/examples/c++/
+%{_datadir}/plplot%{version}/examples/d/
 %{_datadir}/plplot%{version}/examples/f77/
 %{_datadir}/plplot%{version}/examples/f95/
 %{_datadir}/plplot%{version}/examples/Makefile
 %{_datadir}/plplot%{version}/examples/test_c.sh
 %{_datadir}/plplot%{version}/examples/test_cxx.sh
+%{_datadir}/plplot%{version}/examples/test_diff.sh
 %{_datadir}/plplot%{version}/examples/test_f77.sh
 %{_datadir}/plplot%{version}/examples/test_f95.sh
 %{_mandir}/man3/pl*.3*
@@ -481,6 +519,22 @@
 %{_datadir}/plplot%{version}/examples/java/
 %{_datadir}/plplot%{version}/examples/test_java.sh
 
+%files ocaml
+%defattr(-,root,root,-)
+%dir %{_libdir}/ocaml/plplot/
+%{_libdir}/ocaml/plplot/META
+%{_libdir}/ocaml/plplot/*.cma
+%{_libdir}/ocaml/plplot/*.cmi
+%{_libdir}/ocaml/stublibs/*
+%{_datadir}/plplot%{version}/examples/ocaml/
+%{_datadir}/plplot%{version}/examples/test_ocaml.sh
+
+%files ocaml-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/plplotd-ocaml.pc
+%{_libdir}/ocaml/plplot/*.a
+%{_libdir}/ocaml/plplot/*.cmxa
+
 %if %{with_octave}
 %files octave
 %defattr(-,root,root,-)
@@ -530,6 +584,14 @@
 
 
 %changelog
+* Fri Sep 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.9.0-2.svn8752
+- Update to svn revision 8752
+- Add new gnome-python2 BRs
+- Update build_doc BRs
+- Add ocaml sub-package for OCaml interface
+- Enable "D" interface.
+- Re-enable psttfc test, disable perl and compare tests
+
 * Wed Feb 27 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.9.0-1
 - Update to 5.9.0
 - Re-enable smp builds


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Feb 2008 03:08:12 -0000	1.12
+++ sources	5 Sep 2008 23:04:59 -0000	1.13
@@ -1 +1,2 @@
 bfaeba7a5f1ef83edc3787af04694539  plplot-5.9.0.tar.gz
+bb9c3727abd620637056fa6565547558  plplot-5.9.0-svn8752.patch

More information about the fedora-extras-commits mailing list