Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2015-08-01 11:36:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-11 08:22:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2015-08-01 11:36:52.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Jul 26 06:16:23 UTC 2015 - [email protected] + +- Add plplot-swig-3.0.6.patch to fix builds against swig 3.0.6; + patch taken from Fedora and accepted upstream. +- Enable octave bindings back, patch against swig to fix its + octave4 bindings has already entered develprojects and Factory. +- Define %{lua_version} to be 5.3 for openSUSE > 13.2 (Factory + has lua 5.3.x now). +- Drop conditionals for EOL openSUSE versions. + +------------------------------------------------------------------- New: ---- plplot-swig-3.0.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.2sih13/_old 2015-08-01 11:36:53.000000000 +0200 +++ /var/tmp/diff_new_pack.2sih13/_new 2015-08-01 11:36:53.000000000 +0200 @@ -16,10 +16,10 @@ # -%if 0%{?suse_version} <= 1210 -%define lua_version 5.1 -%else +%if 0%{?suse_version} <= 1320 %define lua_version 5.2 +%else +%define lua_version 5.3 %endif %define X_display ":98" @@ -35,6 +35,8 @@ 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-swig-3.0.6.patch [email protected] -- Fix builds against swig 3.0.6; patch taken from Fedora and accepted upstream +Patch2: plplot-swig-3.0.6.patch BuildRequires: cmake >= 2.8.9 BuildRequires: fdupes BuildRequires: freefont @@ -71,7 +73,7 @@ BuildRequires: pkgconfig(lasi) %endif BuildRequires: hdf5-devel -#BuildRequires: octave-devel +BuildRequires: octave-devel %if 0%{?suse_version} >= 1320 BuildRequires: wxWidgets-devel >= 3 %else @@ -488,6 +490,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 for file in NEWS README.release do @@ -518,7 +521,7 @@ -DPL_FREETYPE_FONT_PATH:PATH="%{_datadir}/fonts/truetype" \\\ -DUSE_RPATH:BOOL=OFF \\\ -DENABLE_ada:BOOL=ON \\\ - -DENABLE_octave:BOOL=OFF \\\ + -DENABLE_octave:BOOL=ON \\\ -DENABLE_d:BOOL=ON \\\ -DENABLE_itcl:BOOL=OFF \\\ -DENABLE_itk:BOOL=OFF \\\ @@ -806,15 +809,13 @@ %{_libdir}/plplot%{version}/drivers/qt.driver_info %{_libdir}/plplot%{version}/drivers/qt.so -#%if 0%{?suse_version} >= 1210 -#%files octave -#%defattr(-,root,root) -#%{_datadir}/%{name}_octave/ -#%{_datadir}/octave/site/m/PLplot/ -#%{_libdir}/octave/site/oct/*/plplot_octave.oct -#%{_datadir}/plplot%{version}/examples/octave/ -#%{_datadir}/plplot%{version}/examples/lena.img -#%{_datadir}/plplot%{version}/examples/test_octave.sh -#%endif +%files octave +%defattr(-,root,root) +%{_datadir}/%{name}_octave/ +%{_datadir}/octave/site/m/PLplot/ +%{_libdir}/octave/site/oct/*/plplot_octave.oct +%{_datadir}/plplot%{version}/examples/octave/ +%{_datadir}/plplot%{version}/examples/lena.img +%{_datadir}/plplot%{version}/examples/test_octave.sh %changelog ++++++ plplot-swig-3.0.6.patch ++++++ diff -up plplot-5.11.0/bindings/swig-support/swig_documentation.i.swig plplot-5.11.0/bindings/swig-support/swig_documentation.i --- plplot-5.11.0/bindings/swig-support/swig_documentation.i.swig 2015-04-12 04:08:04.000000000 -0600 +++ plplot-5.11.0/bindings/swig-support/swig_documentation.i 2015-07-07 21:56:01.057486715 -0600 @@ -1747,7 +1747,7 @@ ARGUMENTS: ") plgcol0a; -%feature( "docstring", " Returns the background color (cmap0[0]) by 8-bit RGB value +%feature( "docstring", "Returns the background color (cmap0[0]) by 8-bit RGB value DESCRIPTION: @@ -1776,7 +1776,7 @@ ARGUMENTS: ") plgcolbg; -%feature( "docstring", " Returns the background color (cmap0[0]) by 8-bit RGB value and double alpha transparency value +%feature( "docstring", "Returns the background color (cmap0[0]) by 8-bit RGB value and double alpha transparency value DESCRIPTION: @@ -5005,7 +5005,7 @@ ARGUMENTS: ") plscmap1n; -%feature( "docstring", " Set 8-bit RGB values for given cmap0 color index +%feature( "docstring", "Set 8-bit RGB values for given cmap0 color index DESCRIPTION: @@ -5041,7 +5041,7 @@ ARGUMENTS: ") plscol0; -%feature( "docstring", " Set 8-bit RGB values and double alpha transparency value for given cmap0 color index +%feature( "docstring", "Set 8-bit RGB values and double alpha transparency value for given cmap0 color index DESCRIPTION: @@ -5745,7 +5745,7 @@ my_plshades; plshades; #endif -%feature( "docstring", " Shade individual region on the basis of value +%feature( "docstring", "Shade individual region on the basis of value DESCRIPTION:
