rpms/plplot/EL-6 import.log, NONE, 1.1 .cvsignore, 1.18, 1.19 plplot.spec, 1.90, 1.91 sources, 1.18, 1.19 plplot-5.7.3-jni.patch, 1.1, NONE plplot-5.9.1-octave.patch, 1.1, NONE plplot-5.9.4-octave32.patch, 1.4, NONE plplot-5.9.4-transform_version.patch, 1.1, NONE plplot-5.9.5-test.patch, 1.1, NONE

Orion Poplawski orion at fedoraproject.org
Mon Jun 21 22:10:02 UTC 2010 

Author: orion

Update of /cvs/pkgs/rpms/plplot/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12238/EL-6

Modified Files:
	.cvsignore plplot.spec sources 
Added Files:
	import.log 
Removed Files:
	plplot-5.7.3-jni.patch plplot-5.9.1-octave.patch 
	plplot-5.9.4-octave32.patch 
	plplot-5.9.4-transform_version.patch plplot-5.9.5-test.patch 
Log Message:
Update to 5.9.6


--- NEW FILE import.log ---
plplot-5_9_6-1_fc14:EL-6:plplot-5.9.6-1.fc14.src.rpm:1277158174


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/EL-6/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	28 Sep 2009 17:54:30 -0000	1.18
+++ .cvsignore	21 Jun 2010 22:10:00 -0000	1.19
@@ -1 +1 @@
-plplot-5.9.5.tar.gz
+plplot-5.9.6.tar.gz


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/EL-6/plplot.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- plplot.spec	28 Sep 2009 22:45:43 -0000	1.90
+++ plplot.spec	21 Jun 2010 22:10:02 -0000	1.91
@@ -9,7 +9,7 @@
 %bcond_without pdl
 
 Name:           plplot
-Version:        5.9.5
+Version:        5.9.6
 Release:        1%{?dist}
 Summary:        Library of functions for making scientific plots
 
@@ -19,10 +19,6 @@ URL:            http://plplot.sourceforg
 Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}.tar.gz
 Patch1:         plplot-5.9.3-multiarch.patch
 Patch2:         plplot-5.9.2-info.patch
-Patch3:         plplot-5.9.4-octave32.patch
-Patch4:         plplot-5.9.4-transform_version.patch
-Patch5:         plplot-5.9.5-test.patch
-Patch6:         plplot-5.7.3-jni.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, libtool-ltdl-devel, swig
@@ -43,20 +39,24 @@ BuildRequires:  python-devel, pygtk2-dev
 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
+#For ada
+BuildRequires:  lapack-devel
 BuildRequires:  gnu-free-mono-fonts
 BuildRequires:  gnu-free-sans-fonts
 BuildRequires:  gnu-free-serif-fonts
 %if %{with pdl}
 BuildRequires:  perl(PDL::Graphics::PLplot)
 %endif
-%ifarch %{ix86} x86_64
-BuildRequires:  svgalib-devel
-%endif
 %if %{with doc}
 BuildRequires:  texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-dsssl
 %endif
 %ifnarch sparc64 s390 s390x
-BuildRequires:  ocaml, ocaml-findlib, ocaml-camlidl-devel
+BuildRequires:  ocaml
+BuildRequires:  ocaml-cairo-devel
+BuildRequires:  ocaml-camlidl-devel
+BuildRequires:  ocaml-findlib
+BuildRequires:  ocaml-lablgtk-devel
+BuildRequires:  ocaml-ocamldoc
 %endif
 BuildRequires:  lua-devel
 BuildRequires:  qt-devel
@@ -141,6 +141,18 @@ Requires:       gcc-gnat
 %{summary}.
 
 
+%package        fortran-devel
+Summary:        Development files for using PLplot Fortran bindings
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       gcc-gfortran%{_isa}
+Requires:       pkgconfig
+
+%description    fortran-devel
+%{summary}.
+
+
 %package        java
 Summary:        Functions for scientific plotting with Java
 Group:          Development/Libraries
@@ -289,10 +301,6 @@ Requires:       pkgconfig
 %setup -q
 %patch1 -p1 -b .multiarch
 %patch2 -p1 -b .info
-#%patch3 -p1 -b .octave32
-#patch4 -p1 -b .transform_version
-%patch5 -p1 -b .test
-%patch6 -p1 -b .jni
 # Convert to UTF-8
 for file in ChangeLog NEWS
 do
@@ -312,8 +320,7 @@ export FFLAGS="$RPM_OPT_FLAGS"
 unset TERM
 printenv
 %cmake .. \
-        -DCMAKE_SKIP_RPATH:BOOL=OFF \
-        -DCMAKE_Fortran_COMPILER:FILEPATH=%{_bindir}/gfortran \
+        -DF95_MOD_DIR:PATH=%{_fmoddir} \
         -DUSE_RPATH:BOOL=OFF \
         -DENABLE_ada:BOOL=ON \
         -DHAVE_ADA_2007:BOOL=ON \
@@ -329,11 +336,11 @@ printenv
         -DENABLE_tk:BOOL=ON \
         -DHAVE_PDL_GRAPHICS_PLPLOT_40:BOOL=ON \
         -DHAVE_PTHREAD:BOOL=ON \
+        -DJAVAWRAPPER_DIR:PATH="%{_libdir}/plplot%{version}" \
         -DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/gnu-free" \
         -DPLD_aqt:BOOL=ON \
         -DPLD_conex:BOOL=ON \
         -DPLD_imp:BOOL=ON \
-        -DPLD_linuxvga:BOOL=ON \
         -DPLD_mskermit:BOOL=ON \
         -DPLD_ntk:BOOL=ON \
         -DPLD_pstex:BOOL=ON \
@@ -353,8 +360,6 @@ printenv
         -DPREBUILT_DOC:BOOL=ON \
 %endif
         -DBUILD_TEST:BOOL=ON
-# --debug-output --debug-trycompile \
-#
 make %{?_smp_flags} VERBOSE=1
 
 
@@ -380,12 +385,15 @@ cd fedora
 #Hack
 export ITCL_LIBRARY=%{_libdir}/tcl8.5/itcl3.4
 # Exclude compare tests for now, and ocaml from ppc/ppc64
-# The *qt tests requires an X server, but Xvfb is segfaulting
-# http://bugs.freedesktop.org/show_bug.cgi?id=23815
+# The *qt tests requires an X server
+XAUTHFILE=`mktemp`
+#Not needed on fedora builders?
+#chcon -t xauth_home_t $XAUTHFILE
+ERRORFILE=`mktemp`
 %ifarch ppc ppc64
-xvfb-run -f `mktemp` -e /dev/stderr ctest -V -E 'compare|ocaml|qt'
+xvfb-run -f $XAUTHFILE -e $ERRORFILE ctest -V -E 'compare|ocaml'
 %else
-xvfb-run -f `mktemp` -e /dev/stderr ctest -V -E 'compare|qt'
+xvfb-run -f $XAUTHFILE -e $ERRORFILE ctest -V -E 'compare' || cat $ERRORFILE
 %endif
 
 
@@ -431,7 +439,6 @@ fi
 %{_bindir}/pstex2eps
 %{python_sitearch}/_plplotcmodule.so
 %{python_sitearch}/plplot.py*
-%{python_sitearch}/plplot_widgetmodule.so
 %{python_sitearch}/plplotc.py*
 %{python_sitearch}/Plframe.py*
 %{python_sitearch}/TclSup.py*
@@ -445,10 +452,11 @@ fi
 %{_datadir}/plplot%{version}/*.map
 %{_datadir}/plplot%{version}/*.pal
 %dir %{_datadir}/plplot%{version}/examples
-%{_datadir}/plplot%{version}/examples/python/
-%{_datadir}/plplot%{version}/examples/test_python.sh
+%{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/plplot-test.sh
 %{_datadir}/plplot%{version}/examples/plplot-test-interactive.sh
+%{_datadir}/plplot%{version}/examples/python/
+%{_datadir}/plplot%{version}/examples/test_python.sh
 
 %files libs
 %defattr(-,root,root,-)
@@ -465,10 +473,6 @@ fi
 %dir %{_libdir}/plplot%{version}/driversd
 %{_libdir}/plplot%{version}/driversd/cairo.rc
 %{_libdir}/plplot%{version}/driversd/cairo.so
-%ifarch %{ix86} x86_64
-%{_libdir}/plplot%{version}/driversd/linuxvga.rc
-%{_libdir}/plplot%{version}/driversd/linuxvga.so
-%endif
 %{_libdir}/plplot%{version}/driversd/mem.rc
 %{_libdir}/plplot%{version}/driversd/mem.so
 %{_libdir}/plplot%{version}/driversd/ntk.rc
@@ -496,38 +500,29 @@ fi
 %{_libdir}/libcsironn.so
 %{_libdir}/libplplotcxxd.so
 %{_libdir}/libplplotd.so
-%{_libdir}/libplplotf77cd.so
-%{_libdir}/libplplotf77d.so
-%{_libdir}/libplplotf95cd.so
-%{_libdir}/libplplotf95d.so
 %{_libdir}/libqsastime.so
-%{_libdir}/fortran/
 %{_libdir}/pkgconfig/plplotd.pc
 %{_libdir}/pkgconfig/plplotd-c++.pc
-%{_libdir}/pkgconfig/plplotd-f77.pc
-%{_libdir}/pkgconfig/plplotd-f95.pc
 %{_datadir}/plplot%{version}/examples/CMakeLists.txt
 %dir %{_datadir}/plplot%{version}/examples/cmake
 %dir %{_datadir}/plplot%{version}/examples/cmake/modules
 %{_datadir}/plplot%{version}/examples/cmake/modules/FindPkgConfig.cmake
-%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeFortranInformation.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot-noconfig.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/export_plplot.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/language_support.cmake
+%{_datadir}/plplot%{version}/examples/cmake/modules/language_support/
 %{_datadir}/plplot%{version}/examples/cmake/modules/pkg-config.cmake
 %{_datadir}/plplot%{version}/examples/cmake/modules/plplot_configure.cmake
-%{_datadir}/plplot%{version}/examples/lena.pgm
 %{_datadir}/plplot%{version}/examples/c/
 %{_datadir}/plplot%{version}/examples/c++/
-%{_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_c_interactive.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*
 
+
 %files ada
 %defattr(-,root,root,-)
 %{_libdir}/libplplotadad.so.*
@@ -544,10 +539,22 @@ fi
 #%{_datadir}/ada/adainclude/plplotadad/
 %{_datadir}/plplot%{version}/examples/ada/
 %{_datadir}/plplot%{version}/examples/test_ada.sh
-%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeAdaCompiler.cmake.in
-%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeAdaInformation.cmake
-%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeDetermineAdaCompiler.cmake
-%{_datadir}/plplot%{version}/examples/cmake/modules/CMakeTestAdaCompiler.cmake
+
+%files fortran-devel
+%defattr(-,root,root,-)
+%{_fmoddir}/plplot.mod
+%{_fmoddir}/plplot_flt.mod
+%{_fmoddir}/plplotp.mod
+%{_libdir}/libplplotf77cd.so
+%{_libdir}/libplplotf77d.so
+%{_libdir}/libplplotf95cd.so
+%{_libdir}/libplplotf95d.so
+%{_libdir}/pkgconfig/plplotd-f77.pc
+%{_libdir}/pkgconfig/plplotd-f95.pc
+%{_datadir}/plplot%{version}/examples/f77/
+%{_datadir}/plplot%{version}/examples/f95/
+%{_datadir}/plplot%{version}/examples/test_f77.sh
+%{_datadir}/plplot%{version}/examples/test_f95.sh
 
 %files java
 %defattr(-,root,root,-)
@@ -568,6 +575,10 @@ fi
 %ifnarch sparc64 s390 s390x
 %files ocaml
 %defattr(-,root,root,-)
+%dir %{_libdir}/ocaml/plcairo/
+%{_libdir}/ocaml/plcairo/META
+%{_libdir}/ocaml/plcairo/*.cma
+%{_libdir}/ocaml/plcairo/*.cmi
 %dir %{_libdir}/ocaml/plplot/
 %{_libdir}/ocaml/plplot/META
 %{_libdir}/ocaml/plplot/*.cma
@@ -577,8 +588,12 @@ fi
 %files ocaml-devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/plplotd-ocaml.pc
+%{_libdir}/ocaml/plcairo/*.a
+%{_libdir}/ocaml/plcairo/*.cmxa
+%{_libdir}/ocaml/plcairo/plcairo.mli
 %{_libdir}/ocaml/plplot/*.a
 %{_libdir}/ocaml/plplot/*.cmxa
+%{_libdir}/ocaml/plplot/plplot.mli
 %{_datadir}/plplot%{version}/examples/ocaml/
 %{_datadir}/plplot%{version}/examples/test_ocaml.sh
 %endif
@@ -592,6 +607,7 @@ fi
 %{_datadir}/plplot%{version}/examples/lena.img
 %{_datadir}/plplot%{version}/examples/octave/
 %{_datadir}/plplot%{version}/examples/test_octave.sh
+%{_datadir}/plplot%{version}/examples/test_octave_interactive.sh
 %endif
 
 %if %{with pdl}
@@ -626,6 +642,7 @@ fi
 %{_libdir}/plplot%{version}/driversd/tk.so
 %{_libdir}/plplot%{version}/driversd/tkwin.rc
 %{_libdir}/plplot%{version}/driversd/tkwin.so
+%{python_sitearch}/plplot_widgetmodule.so
 %{_datadir}/plplot%{version}/pkgIndex.tcl
 %{_datadir}/plplot%{version}/examples/test_tcl.sh
 %{_datadir}/plplot%{version}/examples/tcl/
@@ -653,6 +670,32 @@ fi
 
 
 %changelog
+* Mon Jun 21 2010 - Orion Poplawski <orion at cora.nwra.com> - 5.9.6-1
+- Update to 5.9.6
+
+* Thu Jan 14 2010 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-7
+- Add BR lapack-devel for ada support
+- Add more needed ocaml BRs, plcairo module is now built
+- Drop jni patch, fixed with cmake option
+- Re-enable qt tests - xvfb no longer crashes
+
+* Wed Nov 25 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-6
+- Update to svn 10696 to fix build issues
+
+* Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.9.5-5
+- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
+
+* Fri Oct 30 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-4
+- Update to svn 10561 to fix build issues
+- Update test patch
+- Remove obsoleted driver linuxvga
+
+* Mon Oct 26 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-3
+- Create fortran-devel sub-package with fortran development files (bug #523543)
+
+* Thu Oct 22 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-2
+- Move the python plplot_widgetmodule.so to the tk sub-package
+
 * Mon Sep 28 2009 - Orion Poplawski <orion at cora.nwra.com> - 5.9.5-1
 - Update to 5.9.5
 - Disable qt tests for now until Xvfb bug is fixed.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/EL-6/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	28 Sep 2009 17:54:30 -0000	1.18
+++ sources	21 Jun 2010 22:10:02 -0000	1.19
@@ -1 +1 @@
-214c9f984f046bee18f6a3cce2cdec39  plplot-5.9.5.tar.gz
+772c772bde3a107e5f06d21cefa7f6b6  plplot-5.9.6.tar.gz


--- plplot-5.7.3-jni.patch DELETED ---


--- plplot-5.9.1-octave.patch DELETED ---


--- plplot-5.9.4-octave32.patch DELETED ---


--- plplot-5.9.4-transform_version.patch DELETED ---


--- plplot-5.9.5-test.patch DELETED ---

More information about the scm-commits mailing list