From f30af33be48e05e848e60bf5210aae359191122a2cb12131e6e531391c25762f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 16 Feb 2015 14:59:38 +0000 Subject: [PATCH] - Remove cmake-prefix-swig.patch as it caused unexpected regressions OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=195 --- cmake-prefix-swig.patch | 13 ------------- cmake.changes | 5 +++++ cmake.spec | 2 -- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 cmake-prefix-swig.patch diff --git a/cmake-prefix-swig.patch b/cmake-prefix-swig.patch deleted file mode 100644 index 9b9aa31..0000000 --- a/cmake-prefix-swig.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: cmake-3.1.0/Modules/UseSWIG.cmake -=================================================================== ---- cmake-3.1.0.orig/Modules/UseSWIG.cmake -+++ cmake-3.1.0/Modules/UseSWIG.cmake -@@ -260,7 +260,7 @@ macro(SWIG_ADD_MODULE name language) - set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "") - elseif ("${swig_lowercase_language}" STREQUAL "python") - # this is only needed for the python case where a _modulename.so is generated -- set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "") -+ set_target_properties(${SWIG_MODULE_${name}_REAL_NAME} PROPERTIES PREFIX "_") - # Python extension modules on Windows must have the extension ".pyd" - # instead of ".dll" as of Python 2.5. Older python versions do support - # this suffix. diff --git a/cmake.changes b/cmake.changes index 1eff308..76e029e 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 16 14:59:01 UTC 2015 - tchvatal@suse.com + +- Remove cmake-prefix-swig.patch as it caused unexpected regressions + ------------------------------------------------------------------- Sat Feb 14 19:48:11 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/cmake.spec b/cmake.spec index ae416f4..18a15a2 100644 --- a/cmake.spec +++ b/cmake.spec @@ -28,8 +28,6 @@ Source0: http://www.cmake.org/files/v3.2/%{name}-%{rversion}.tar.gz Source1: cmake.macros Source2: opensuse_rules.cmake Patch2: cmake-fix-ruby-test.patch -# PATCH-FIX-OPENSUSE: bnc#874885 contain the python swig namespace -Patch3: cmake-prefix-swig.patch # PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes Patch4: form.patch # PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs