Hello community, here is the log from the commit of package Qross for openSUSE:Factory checked in at 2014-07-11 06:46:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Qross (Old) and /work/SRC/openSUSE:Factory/.Qross.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Qross" Changes: -------- --- /work/SRC/openSUSE:Factory/Qross/Qrosspython.changes 2014-02-19 07:24:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.Qross.new/Qrosspython.changes 2014-07-11 06:46:50.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 4 14:16:30 UTC 2014 - [email protected] + +- Added Qrosspython-cmake3.patch vs. cmake3 compatibility issue: + https://github.com/0xd34df00d/Qross/commit/9053d214840 + +------------------------------------------------------------------- New: ---- Qrosspython-cmake3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Qrosspython.spec ++++++ --- /var/tmp/diff_new_pack.oyOj1n/_old 2014-07-11 06:46:51.000000000 +0200 +++ /var/tmp/diff_new_pack.oyOj1n/_new 2014-07-11 06:46:51.000000000 +0200 @@ -39,6 +39,9 @@ # really only src/bindings/python works now, see more at # https://bugzilla.novell.com/show_bug.cgi?id=861882 Source0: Qross-%{version}.tar.xz +# https://github.com/0xd34df00d/Qross/commit/9053d214840 +# PATCH-FIX-UPSTREAM vs. cmake3 compatibility issue. +Patch0: Qrosspython-cmake3.patch BuildRequires: Qross-devel BuildRequires: python-sip-devel @@ -67,6 +70,7 @@ %prep %setup -q -n Qross-%{version}/src/bindings/python/qrosspython +%patch0 -p1 %build ++++++ Qrosspython-cmake3.patch ++++++ diff --git a/src/bindings/python/qrosspython/CMakeLists.txt b/src/bindings/python/qrosspython/CMakeLists.txt index 5bd5b73..e0a0e68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,12 @@ find_package(Qt4 REQUIRED) set(QT_USE_QTTEST TRUE) include(${QT_USE_FILE}) -set (PythonLibs_FIND_VERSION 2.7) -find_package(PythonLibs REQUIRED) +if (${CMAKE_MAJOR_VERSION} EQUAL 2) + set (PythonLibs_FIND_VERSION 2.7) + find_package(PythonLibs REQUIRED) +else () + find_package(PythonLibs "2.7" REQUIRED) +endif () include_directories( ${PYTHON_INCLUDE_PATH} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
