diff --git a/cmake-2.8.10-compat.diff b/cmake-2.8.10-compat.diff new file mode 100644 index 0000000..a7b208f --- /dev/null +++ b/cmake-2.8.10-compat.diff @@ -0,0 +1,15 @@ +--- 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") + diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 9b36369..87ba516 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 12 11:26:35 UTC 2012 - cgiboudeaux@gmx.com + +- Add cmake-2.8.10-compat.diff +Fixes a CMake error with CMake >= 2.8.10 (bnc#789219) + + ------------------------------------------------------------------- Tue Oct 16 07:15:34 UTC 2012 - dimstar@opensuse.org diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index d4b3b31..e9098ba 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -47,6 +47,8 @@ Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf +# PATCH-FIX-OPENSUSE -- cmake-2.8.10-compat.diff [bnc#789219] -- 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 @@ about network configuration changes. %prep %setup -q -n %{_sourcename} +%patch0 mkdir build %build diff --git a/libproxy.changes b/libproxy.changes index 9b36369..87ba516 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 12 11:26:35 UTC 2012 - cgiboudeaux@gmx.com + +- Add cmake-2.8.10-compat.diff +Fixes a CMake error with CMake >= 2.8.10 (bnc#789219) + + ------------------------------------------------------------------- Tue Oct 16 07:15:34 UTC 2012 - dimstar@opensuse.org diff --git a/libproxy.spec b/libproxy.spec index d3cb516..24a23aa 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -47,6 +47,8 @@ Source: http://libproxy.googlecode.com/files/%{_name}-%{version}.tar.gz # Script used for automatic snapshot updates Source98: update-from-svn.sh Source99: baselibs.conf +# PATCH-FIX-OPENSUSE -- cmake-2.8.10-compat.diff [bnc#789219] -- 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 @@ about network configuration changes. %prep %setup -q -n %{_sourcename} +%patch0 mkdir build %build