Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2014-02-19 07:24:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plplot" Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2014-02-02 18:11:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2014-02-19 07:24:16.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Feb 13 01:31:27 UTC 2014 - [email protected] + +- Update to version 5.10.0: + + Update the parts of the build system that find Tcl-related + software + + Update api.xml to be consistent with our public API defined by + plplot.h +- Packaging changes: + + Drop plplot-avoid-config_h-nameclash.patch: incorporated + upstream + + Add BuildRequires: xorg-x11-server as %configure requires + x-server to find and enable the tk bindings now + + Implement a %check section to carry out build testing, but + disable actual testing until octave tests are fixed + + Also package the FAQ file as %doc. + +------------------------------------------------------------------- Old: ---- plplot-5.9.11.tar.gz plplot-avoid-config_h-nameclash.patch New: ---- plplot-5.10.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.OlgwSe/_old 2014-02-19 07:24:17.000000000 +0100 +++ /var/tmp/diff_new_pack.OlgwSe/_new 2014-02-19 07:24:17.000000000 +0100 @@ -22,8 +22,10 @@ %define lua_version 5.2 %endif +%define X_display ":98" + Name: plplot -Version: 5.9.11 +Version: 5.10.0 Release: 0 Summary: Cross-platform software package for creating scientific plots License: LGPL-2.1+ @@ -33,8 +35,6 @@ Source1: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM plplot-5.9.9-ada-pic.patch [email protected] -- Compile Ada code with -fPIC Patch1: plplot-5.9.9-ada-pic.patch -# PATCH-FIX-UPSTREAM plplot-avoid-config_h-nameclash.patch [email protected] -- Fix plplot build errors for openSUSE > 13.1 when octave bindings are enabled; patch taken from upstream svn -Patch2: plplot-avoid-config_h-nameclash.patch BuildRequires: cmake >= 2.8.9 BuildRequires: fdupes BuildRequires: freefont @@ -56,6 +56,8 @@ BuildRequires: swig BuildRequires: tcl-devel BuildRequires: tk-devel +# Required for enabling tk driverand in the %check section, currently disabled +BuildRequires: xorg-x11-server BuildRequires: perl(XML::DOM) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gnome-python-2.0) @@ -489,7 +491,6 @@ %prep %setup -q %patch1 -p1 -%patch2 -p0 for file in NEWS README.release do @@ -508,6 +509,11 @@ export FFLAGS="%{optflags}" mkdir builddir pushd builddir + +# X-server and $DISPLAY required to enable tk bindings +export DISPLAY=%{X_display} +Xvfb %{X_display} >& Xvfb.log & +sleep 5 cmake \ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ @@ -520,7 +526,6 @@ -DENABLE_itcl:BOOL=OFF \\\ -DENABLE_itk:BOOL=OFF \\\ -DENABLE_tk:BOOL=ON \\\ - -DPLD_ntk:BOOL=ON \\\ -DENABLE_ocaml:BOOL=ON \\\ -DPLD_aqt:BOOL=ON \\\ -DPLD_conex:BOOL=ON \\\ @@ -537,7 +542,7 @@ -DBUILD_DOC:BOOL=OFF \\\ -DPREBUILT_DOC:BOOL=ON \\\ -DJAVAWRAPPER_DIR:PATH="%{_libdir}/plplot%{version}" \\\ - -DBUILD_TEST:BOOL=OFF \\\ + -DBUILD_TEST:BOOL=ON \\\ -DENABLE_lua:BOOL=ON \\\ .. @@ -581,6 +586,17 @@ %fdupes %{buildroot}%{_datadir}/ +# Disable check section for now (until octave tests are fixed) +#%check +#pushd builddir +#octave tests require Xserver display +#export DISPLAY=%{X_display} +#Xvfb %{X_display} >& Xvfb.log & +#sleep 5 +#export octaveopts=--no-window-system +#make %{?_smp_mflags} test_diff_psc +#popd + %post /sbin/ldconfig /sbin/install-info %{_infodir}/plplotdoc.info %{_infodir}/dir @@ -618,7 +634,7 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING.LIB Copyright README README.release +%doc AUTHORS COPYING.LIB Copyright FAQ README README.release %{_bindir}/pltek %{_infodir}/plplotdoc.info* %{_mandir}/man1/pltek.1.gz @@ -661,8 +677,8 @@ %{_libdir}/plplot%{version}/driversd/ntk.so %{_libdir}/plplot%{version}/driversd/null.driver_info %{_libdir}/plplot%{version}/driversd/null.so -%{_libdir}/plplot%{version}/driversd/ps.driver_info %{_libdir}/plplot%{version}/driversd/ps.so +%{_libdir}/plplot%{version}/driversd/ps.driver_info %if 0%{?suse_version} >= 1310 %{_libdir}/plplot%{version}/driversd/psttf.driver_info %{_libdir}/plplot%{version}/driversd/psttf.so ++++++ plplot-5.9.11.tar.gz -> plplot-5.10.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/plplot/plplot-5.9.11.tar.gz /work/SRC/openSUSE:Factory/.plplot.new/plplot-5.10.0.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
