diff --git a/cmake-2.8.10-compat.diff b/cmake-2.8.10-compat.diff deleted file mode 100644 index a7b208f..0000000 --- a/cmake-2.8.10-compat.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- 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-0.4.10.tar.gz b/libproxy-0.4.10.tar.gz deleted file mode 100644 index dcf456b..0000000 --- a/libproxy-0.4.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:023e3c1023c522333ac4c414e9cb6db05bc564d3e5d30570e2db07aac100c635 -size 378318 diff --git a/libproxy-0.4.11.tar.gz b/libproxy-0.4.11.tar.gz new file mode 100644 index 0000000..8a2602b --- /dev/null +++ b/libproxy-0.4.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc3f33de54163718f82b3e7c496a7de97f8862578414b8ecaad3cbfe4821864b +size 93757 diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 6e50ed6..d44f8f2 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Dec 2 12:24:23 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.4.11: + + Build fixes with cmake 2.8.10+. + + Quick release without built binaries / files (bug#184). +- Drop cmake-2.8.10-compat.diff: fixed upstream. + ------------------------------------------------------------------- Mon Nov 12 11:26:35 UTC 2012 - cgiboudeaux@gmx.com diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index c841d0e..5178f8c 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -35,7 +35,7 @@ Name: libproxy-plugins Summary: Libproxy provides consistent proxy configuration to applications License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Version: 0.4.10 +Version: 0.4.11 Release: 0 # FIXME: verify if test suite works - 0.4.10 has weird behavior in some cases, where the internal server times out. %if 0%{?build_snapshot} @@ -47,8 +47,6 @@ 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-UPSTREAM cmake-2.8.10-compat.diff bnc#789219 cgiboudeaux@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++ @@ -312,7 +310,6 @@ about network configuration changes. %prep %setup -q -n %{_sourcename} -%patch0 mkdir build %build diff --git a/libproxy.changes b/libproxy.changes index 6e50ed6..d44f8f2 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Dec 2 12:24:23 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.4.11: + + Build fixes with cmake 2.8.10+. + + Quick release without built binaries / files (bug#184). +- Drop cmake-2.8.10-compat.diff: fixed upstream. + ------------------------------------------------------------------- Mon Nov 12 11:26:35 UTC 2012 - cgiboudeaux@gmx.com diff --git a/libproxy.spec b/libproxy.spec index 3dc9c54..0c9a4c1 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -35,7 +35,7 @@ Name: libproxy Summary: Libproxy provides consistent proxy configuration to applications License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Version: 0.4.10 +Version: 0.4.11 Release: 0 # FIXME: verify if test suite works - 0.4.10 has weird behavior in some cases, where the internal server times out. %if 0%{?build_snapshot} @@ -47,8 +47,6 @@ 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-UPSTREAM cmake-2.8.10-compat.diff bnc#789219 cgiboudeaux@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++ @@ -312,7 +310,6 @@ about network configuration changes. %prep %setup -q -n %{_sourcename} -%patch0 mkdir build %build