Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2014-02-02 18:11:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-03 15:00:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2014-02-02 18:11:32.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Jan 30 13:00:30 UTC 2014 - badshah400@gmail.com + +- Enable octave bindings (requires patched swig version from + devel:tools:building) +- Add patch plplot-avoid-config_h-nameclash.patch to fix build + errors when octave bindings are enabled for openSUSE > 13.1; + patch taken from upstream svn. + +------------------------------------------------------------------- New: ---- plplot-avoid-config_h-nameclash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.LuUC0l/_old 2014-02-02 18:11:33.000000000 +0100 +++ /var/tmp/diff_new_pack.LuUC0l/_new 2014-02-02 18:11:33.000000000 +0100 @@ -33,6 +33,8 @@ Source1: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM plplot-5.9.9-ada-pic.patch idoenmez@suse.de -- Compile Ada code with -fPIC Patch1: plplot-5.9.9-ada-pic.patch +# PATCH-FIX-UPSTREAM plplot-avoid-config_h-nameclash.patch badshah400@gmail.com -- 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 @@ -487,6 +489,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p0 for file in NEWS README.release do @@ -512,7 +515,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 \\\ @@ -776,15 +779,15 @@ %{_libdir}/plplot%{version}/driversd/qt.driver_info %{_libdir}/plplot%{version}/driversd/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 +%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 %changelog ++++++ plplot-avoid-config_h-nameclash.patch ++++++ ++++ 769 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org