Accepting request 185473 from home:vitezslav_cizek:branches:devel:tools:building

- Drop cmake-disable-builtin-chrpath.diff (bnc#786345)
  The RPATH/RUNPATH bug was fixed in 2.8.0

OBS-URL: https://build.opensuse.org/request/show/185473
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=117

cmake-disable-builtin-chrpath.diff

@@ -1,11 +0,0 @@
---- Source/cmTarget.cxx.orig	2012-11-02 14:39:11.177148019 +0100
-+++ Source/cmTarget.cxx	2012-11-02 14:39:21.777018932 +0100
-@@ -4130,7 +4130,7 @@
-     }
- 
-   // Allow the user to disable builtin chrpath explicitly.
--  if(this->Makefile->IsOn("CMAKE_NO_BUILTIN_CHRPATH"))
-+  if(1 || this->Makefile->IsOn("CMAKE_NO_BUILTIN_CHRPATH"))
-     {
-     return false;
-     }

cmake-gui.spec

@@ -21,7 +21,6 @@ Version:        2.8.11.1
 Release:        0
 Url:            http://www.cmake.org/
 Source0:        http://www.cmake.org/files/v2.8/cmake-%{version}.tar.gz
-Patch4:         cmake-disable-builtin-chrpath.diff
 Summary:        CMake graphical user interface
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
@@ -50,7 +49,6 @@ open-source make system.
 
 %prep
 %setup -q -n cmake-%{version}
-%patch4
 
 %build
 EXTRA_FLAGS="--qt-gui"

cmake.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug  1 09:12:20 UTC 2013 - vcizek@suse.com
+
+- Drop cmake-disable-builtin-chrpath.diff (bnc#786345)
+  The RPATH/RUNPATH bug was fixed in 2.8.0
+
 -------------------------------------------------------------------
 Wed Jul 17 11:49:37 UTC 2013 - vcizek@suse.com
 

cmake.spec

@@ -21,7 +21,6 @@ Version:        2.8.11.1
 Release:        0
 Url:            http://www.cmake.org/
 Source0:        http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
-Patch1:         cmake-disable-builtin-chrpath.diff
 Patch2:         cmake-fix-ruby-test.patch
 Patch3:         cmake-fix-ImageMagick6.patch
 Patch4:         cmake-cmCustomCommand_add_operator=.patch
@@ -51,7 +50,6 @@ CMake is a cross-platform, open-source make system
 
 %prep
 %setup -q
-%patch1
 %patch2
 %patch3 -p1
 %patch4 -p1