Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2015-02-01 12:30:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-25 08:43:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2015-02-01 12:30:05.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Jan 31 00:18:15 UTC 2015 - [email protected] + +- Added 0001-fix_for_cmake_3.1.patch to fix building on cmake>3.0 + http://sourceforge.net/p/plplot/plplot/ci/772223c638ecf5dc740c9f3dd7a6883c6d2c83d2/ + +------------------------------------------------------------------- New: ---- 0001-fix_for_cmake_3.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.lnNOVe/_old 2015-02-01 12:30:07.000000000 +0100 +++ /var/tmp/diff_new_pack.lnNOVe/_new 2015-02-01 12:30:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package plplot # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -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 0001-fix_for_cmake_3.1.patch [email protected] -- Backport from Upstream +Patch2: 0001-fix_for_cmake_3.1.patch BuildRequires: cmake >= 2.8.9 BuildRequires: fdupes BuildRequires: freefont @@ -56,6 +58,7 @@ BuildRequires: swig BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: pkgconfig(pango) # Required for enabling tk driverand in the %check section, currently disabled BuildRequires: xorg-x11-server BuildRequires: perl(XML::DOM) @@ -491,6 +494,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 for file in NEWS README.release do ++++++ 0001-fix_for_cmake_3.1.patch ++++++ Index: plplot-5.10.0/cmake/modules/pkg-config.cmake =================================================================== --- plplot-5.10.0.orig/cmake/modules/pkg-config.cmake +++ plplot-5.10.0/cmake/modules/pkg-config.cmake @@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _incl set(_xprefix ${_prefix}) endif(FORCE_EXTERNAL_STATIC) - _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") + if(CMAKE_VERSION VERSION_LESS "3.1") + _pkg_check_modules_internal (0 0 ${_prefix} "${_package}") + else(CMAKE_VERSION VERSION_LESS "3.1") + _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") + endif(CMAKE_VERSION VERSION_LESS "3.1") + if(${_prefix}_FOUND) cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}") # If libraries cannot be not found, then that is equivalent to whole -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
