Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at 2012-11-13 09:41:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libproxy (Old) and /work/SRC/openSUSE:Factory/.libproxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libproxy", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libproxy/libproxy-plugins.changes 2012-10-19 13:32:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libproxy.new/libproxy-plugins.changes 2012-11-13 09:41:51.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 12 11:26:35 UTC 2012 - cgiboude...@gmx.com + +- Add cmake-2.8.10-compat.diff: fixes a CMake error with + CMake >= 2.8.10 (bnc#789219). + +------------------------------------------------------------------- libproxy.changes: same change New: ---- cmake-2.8.10-compat.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.PXQJMQ/_old 2012-11-13 09:41:52.000000000 +0100 +++ /var/tmp/diff_new_pack.PXQJMQ/_new 2012-11-13 09:41:52.000000000 +0100 @@ -47,6 +47,8 @@ # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf +# PATCH-FIX-UPSTREAM cmake-2.8.10-compat.diff bnc#789219 cgiboude...@gmx.com -- Fix build with CMake >= 2.8.10, see http://mail.kde.org/pipermail/kde-buildsystem/2012-November/008948.html +Patch0: cmake-2.8.10-compat.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -310,6 +312,7 @@ %prep %setup -q -n %{_sourcename} +%patch0 mkdir build %build libproxy.spec: same change ++++++ cmake-2.8.10-compat.diff ++++++ --- cmake/CMakeDetermineCSharpCompiler.cmake.old 2012-11-12 12:17:02.099397946 +0100 +++ cmake/CMakeDetermineCSharpCompiler.cmake 2012-11-12 12:19:46.425382193 +0100 @@ -92,7 +92,11 @@ endif (CMAKE_CSharp_COMPILER) # configure variables set in this file for fast reload later on +if(NOT CMAKE_PLATFORM_INFO_DIR) # pre-2.8.10 + set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}) +endif() + configure_file(${CMAKE_SOURCE_DIR}/cmake/CMakeCSharpCompiler.cmake.in - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY) + ${CMAKE_PLATFORM_INFO_DIR}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY) set(CMAKE_CSharp_COMPILER_ENV_VAR "CSC") -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
