Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2016-08-10 19:55:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-04-14 13:07:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2016-08-10 19:55:58.000000000 +0200 @@ -1,0 +2,21 @@ +Mon Aug 8 07:45:35 UTC 2016 - [email protected] + +- Define macro "octave_enabled" to consistently check when + octave bindings are disabled (only for openSUSE:Leap:42.1). +- Disable tk bindings also for openSUSE:Leap:42.2 -- it does not + build because of Xvfb crash (boo#992429). + +------------------------------------------------------------------- +Sat Aug 6 14:25:12 UTC 2016 - [email protected] + +- Enable octave bindings for openSUSE >= 13.2; builds just fine + now. + +------------------------------------------------------------------- +Sat Aug 6 13:50:06 UTC 2016 - [email protected] + +- Add plplot-cmake36-pkg_check_pkgconfig_macro.patch to fix + plplot's defined pkg_check_pkgconfig macro to work with + cmake >= 3.6; patch sent upstream. + +------------------------------------------------------------------- New: ---- plplot-cmake36-pkg_check_pkgconfig_macro.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.M2CYFv/_old 2016-08-10 19:55:59.000000000 +0200 +++ /var/tmp/diff_new_pack.M2CYFv/_new 2016-08-10 19:55:59.000000000 +0200 @@ -22,12 +22,18 @@ %define lua_version 5.3 %endif -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || (0%{?is_opensuse} && 0%{?sle_version}==120200) %define tk_enabled 0 %else %define tk_enabled 1 %endif +%if 0%{?suse_version} != 1315 || (0%{?is_opensuse} && 0%{?sle_version}==120200) +%define octave_enabled 1 +%else +%define octave_enabled 0 +%endif + %define X_display ":98" Name: plplot @@ -41,6 +47,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-cmake36-pkg_check_pkgconfig_macro.patch [email protected] -- Fix plplot's defined pkg_check_pkgconfig macro to work with cmake >= 3.6; patch sent upstream +Patch2: plplot-cmake36-pkg_check_pkgconfig_macro.patch BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: freefont @@ -63,6 +71,7 @@ BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(pangoft2) # Required for enabling tk driverand in the %%check section, currently disabled BuildRequires: xorg-x11-server BuildRequires: perl(XML::DOM) @@ -493,6 +502,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 for file in NEWS README.release do @@ -523,15 +533,15 @@ -DPL_FREETYPE_FONT_PATH:PATH="%{_datadir}/fonts/truetype" \\\ -DUSE_RPATH:BOOL=OFF \\\ -DENABLE_ada:BOOL=ON \\\ -%if 0%{?suse_version} == 1315 || 0%{?suse_version} > 1320 - -DENABLE_octave:BOOL=OFF \\\ -%else +%if 0%{?octave_enabled} -DENABLE_octave:BOOL=ON \\\ -DTRY_OCTAVE4=ON \\\ +%else + -DENABLE_octave:BOOL=OFF \\\ %endif -DENABLE_d:BOOL=ON \\\ -DENABLE_itcl:BOOL=ON \\\ -%if 0%{?suse_version} > 1320 +%if 0%{?tk_enabled} > 1320 -DENABLE_itk:BOOL=OFF \\\ -DENABLE_tk:BOOL=OFF \\\ %else @@ -831,7 +841,7 @@ %{_libdir}/plplot%{version}/drivers/qt.driver_info %{_libdir}/plplot%{version}/drivers/qt.so -%if 0%{?suse_version} != 1315 && 0%{?suse_version} <= 1320 +%if 0%{?octave_enabled} %files octave %defattr(-,root,root) %{_datadir}/%{name}_octave/ ++++++ plplot-cmake36-pkg_check_pkgconfig_macro.patch ++++++ Index: plplot-5.11.1/cmake/modules/pkg-config.cmake =================================================================== --- plplot-5.11.1.orig/cmake/modules/pkg-config.cmake +++ plplot-5.11.1/cmake/modules/pkg-config.cmake @@ -120,8 +120,10 @@ macro(pkg_check_pkgconfig _package _incl if(CMAKE_VERSION VERSION_LESS "3.1") _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") - else(CMAKE_VERSION VERSION_LESS "3.1") + elseif(CMAKE_VERSION VERSION_LESS "3.6") _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") + else(CMAKE_VERSION VERSION_LESS "3.1") + _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}") endif(CMAKE_VERSION VERSION_LESS "3.1") if(${_prefix}_FOUND)
