Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2016-04-05 10:44:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-11-26 17:04:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2016-04-05 10:44:03.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Mar 30 14:52:11 UTC 2016 - [email protected] + +- Disable octave bindings for openSUSE > 13.2 temporarily until + related build failures are sorted out. +- Tk in Factory is not compatible with plplot apparently, turn + off tk bindings until fix found. +- Bump required cmake version to 3.0.2, has been required since + v5.11.1. +- Some rpmlint warning cleanups from using macros in comments. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.CMqo0e/_old 2016-04-05 10:44:04.000000000 +0200 +++ /var/tmp/diff_new_pack.CMqo0e/_new 2016-04-05 10:44:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package plplot # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,6 +22,12 @@ %define lua_version 5.3 %endif +%if 0%{?suse_version} > 1320 +%define tk_enabled 0 +%else +%define tk_enabled 1 +%endif + %define X_display ":98" Name: plplot @@ -35,7 +41,7 @@ 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 -BuildRequires: cmake >= 2.8.9 +BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: freefont BuildRequires: gcc-ada @@ -57,7 +63,7 @@ BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: pkgconfig(pango) -# Required for enabling tk driverand in the %check section, currently disabled +# Required for enabling tk driverand in the %%check section, currently disabled BuildRequires: xorg-x11-server BuildRequires: perl(XML::DOM) BuildRequires: pkgconfig(freetype2) @@ -517,15 +523,15 @@ -DPL_FREETYPE_FONT_PATH:PATH="%{_datadir}/fonts/truetype" \\\ -DUSE_RPATH:BOOL=OFF \\\ -DENABLE_ada:BOOL=ON \\\ -%if 0%{?suse_version} == 1315 +%if 0%{?suse_version} == 1315 || 0%{?suse_version} > 1320 -DENABLE_octave:BOOL=OFF \\\ %else -DENABLE_octave:BOOL=ON \\\ -DTRY_OCTAVE4=ON \\\ %endif -DENABLE_d:BOOL=ON \\\ - -DENABLE_itcl:BOOL=OFF \\\ - -DENABLE_itk:BOOL=OFF \\\ + -DENABLE_itcl:BOOL=ON \\\ + -DENABLE_itk:BOOL=ON \\\ -DENABLE_tk:BOOL=ON \\\ -DENABLE_ocaml:BOOL=ON \\\ -DPLD_aqt:BOOL=ON \\\ @@ -580,8 +586,10 @@ mkdir -p %{buildroot}%{_docdir} mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/%{name}-doc +%if %{tk_enabled} #Grant executable permissions to example tk binaries with valid shebang chmod +x %{buildroot}%{_datadir}/%{name}%{version}/examples/tk/tk03 +%endif #Remove a fortran static library rm -fr %{buildroot}%{_libdir}/libplf95*.a @@ -589,14 +597,14 @@ %fdupes %{buildroot}%{_datadir}/ ## Disable check section for now (until octave tests are fixed) -#%check +#%%check #pushd builddir ## octave tests require Xserver display -#export DISPLAY=%{X_display} -#Xvfb %{X_display} >& Xvfb.log & +#export DISPLAY=%%{X_display} +#Xvfb %%{X_display} >& Xvfb.log & #sleep 5 #export octaveopts=--no-window-system -#make %{?_smp_mflags} test_diff_psc +#make %%{?_smp_mflags} test_diff_psc #popd %post @@ -640,12 +648,12 @@ %{_infodir}/plplotdoc.info* %{_mandir}/man1/pltek.1.gz # PLMETA DRIVER DISABLED -#%{_bindir}/plm2gif -#%{_bindir}/plpr -#%{_bindir}/plrender -#%{_mandir}/man1/plm2gif.1.gz -#%{_mandir}/man1/plpr.1.gz -#%{_mandir}/man1/plrender.1.gz +#%%{_bindir}/plm2gif +#%%{_bindir}/plpr +#%%{_bindir}/plrender +#%%{_mandir}/man1/plm2gif.1.gz +#%%{_mandir}/man1/plpr.1.gz +#%%{_mandir}/man1/plrender.1.gz %dir %{_datadir}/plplot%{version} %{_datadir}/plplot%{version}/*.fnt %{_datadir}/plplot%{version}/*.map @@ -659,8 +667,10 @@ %{python_sitearch}/_plplotcmodule.so %{python_sitearch}/plplot.py* %{python_sitearch}/plplotc.py* +%if %{tk_enabled} %{python_sitearch}/Plframe.py* %{python_sitearch}/TclSup.py* +%endif %{_libdir}/libcsirocsa.so.* %{_libdir}/libplplotcxx.so.* %{_libdir}/libplplot.so.* @@ -685,8 +695,10 @@ %{_libdir}/plplot%{version}/drivers/cairo.so %{_libdir}/plplot%{version}/drivers/mem.driver_info %{_libdir}/plplot%{version}/drivers/mem.so +%if %{tk_enabled} %{_libdir}/plplot%{version}/drivers/ntk.driver_info %{_libdir}/plplot%{version}/drivers/ntk.so +%endif %{_libdir}/plplot%{version}/drivers/null.driver_info %{_libdir}/plplot%{version}/drivers/null.so %{_libdir}/plplot%{version}/drivers/ps.so @@ -710,9 +722,9 @@ %{_datadir}/plplot%{version}/examples/test_diff.sh %{_mandir}/man3/pl*.3* # PLMETA DRIVER DISABLED -#%{_datadir}/plplot%{version}/examples/test_plrender.sh -#%{_libdir}/plplot%{version}/drivers/plmeta.driver_info -#%{_libdir}/plplot%{version}/drivers/plmeta.so +#%%{_datadir}/plplot%%{version}/examples/test_plrender.sh +#%%{_libdir}/plplot%%{version}/drivers/plmeta.driver_info +#%%{_libdir}/plplot%%{version}/drivers/plmeta.so %files ada %defattr(-,root,root) @@ -778,12 +790,14 @@ %{_mandir}/man1/plserver.1.gz %{_mandir}/man1/pltcl.1.gz %{python_sitearch}/plplot_widgetmodule.so +%if %{tk_enabled} %{_bindir}/plserver %{_datadir}/plplot%{version}/examples/tk/ %{_libdir}/plplot%{version}/drivers/tk.driver_info %{_libdir}/plplot%{version}/drivers/tk.so %{_libdir}/plplot%{version}/drivers/tkwin.driver_info %{_libdir}/plplot%{version}/drivers/tkwin.so +%endif %files wxwidgets %defattr(-,root,root) @@ -812,7 +826,7 @@ %{_libdir}/plplot%{version}/drivers/qt.driver_info %{_libdir}/plplot%{version}/drivers/qt.so -%if 0%{?suse_version} != 1315 +%if 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 %files octave %defattr(-,root,root) %{_datadir}/%{name}_octave/
