testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity

update to 2.8.3

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=70
This commit is contained in:
Petr Uzel 2010-11-04 14:02:01 +00:00 committed by Git OBS Bridge
parent cd3c916282
commit 7c768aab57
8 changed files with 33 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake-2.8.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1a54476bf25d8c61a1f5f2eb708e12a3a7487dfe04ad4a5ab91c0d110f39a9a
size 4153648

3
cmake-2.8.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b4fe2c354015b1b5caa135f2854b5b2d5b092af4acc61e699d344545937d327
size 4155865

22
cmake-FindGTK2-gdk-pixbuf.patch
View File

@ -1,22 +0,0 @@
Index: cmake-2.8.2/Modules/FindGTK2.cmake
===================================================================
--- cmake-2.8.2.orig/Modules/FindGTK2.cmake
+++ cmake-2.8.2/Modules/FindGTK2.cmake
@@ -138,6 +138,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hd
atkmm-1.6
cairo
cairomm-1.0
+ gdk-pixbuf-2.0
gdkmm-2.4
giomm-2.4
gtk-2.0
@@ -399,6 +400,9 @@ foreach(_GTK2_component ${GTK2_FIND_COMP
_GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h)
_GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true)
+ _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h)
+ _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true)
+
_GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h)
_GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h)
_GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true)

6
cmake-gui.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package cmake-gui (Version 2.8.2)
# spec file for package cmake-gui (Version 2.8.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,7 +19,7 @@
Name: cmake-gui
Version: 2.8.2
Version: 2.8.3
Release: 3
License: BSD3c
Group: Development/Tools/Building
@ -27,6 +27,7 @@ Url: http://www.cmake.org/
Source0: cmake-%{version}.tar.bz2
Patch4: cmake-disable-builtin-chrpath.diff
Patch5: fortify-buffer-overflows.diff
Patch6: cmake-no-system-libarchive.patch
Summary: CMake graphical user interface
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
@ -58,6 +59,7 @@ Authors:
%setup -q -n cmake-%{version}
%patch4
%patch5
%patch6 -p1
%build
EXTRA_FLAGS="--qt-gui"

13
cmake-no-system-libarchive.patch Normal file
View File

@ -0,0 +1,13 @@
Index: cmake-2.8.3/CMakeLists.txt
===================================================================
--- cmake-2.8.3.orig/CMakeLists.txt
+++ cmake-2.8.3/CMakeLists.txt
@@ -71,7 +71,7 @@ MACRO(CMAKE_HANDLE_SYSTEM_LIBRARIES)
CACHE BOOL "Use system-installed zlib" FORCE)
SET(CMAKE_USE_SYSTEM_BZIP2 "${CMAKE_USE_SYSTEM_LIBRARIES}"
CACHE BOOL "Use system-installed bzip2" FORCE)
- SET(CMAKE_USE_SYSTEM_LIBARCHIVE "${CMAKE_USE_SYSTEM_LIBRARIES}"
+ SET(CMAKE_USE_SYSTEM_LIBARCHIVE "OFF"
CACHE BOOL "Use system-installed libarchive" FORCE)
ENDIF(CMAKE_USE_SYSTEM_LIBRARIES_USER)

26
cmake-support-new-python.diff
View File

@ -1,26 +0,0 @@
Index: cmake-2.8.2/Modules/FindPythonInterp.cmake
===================================================================
--- cmake-2.8.2.orig/Modules/FindPythonInterp.cmake 2010-06-28 17:15:57.000000000 +0200
+++ cmake-2.8.2/Modules/FindPythonInterp.cmake 2010-09-07 10:56:37.825385191 +0200
@@ -20,7 +20,7 @@
# License text for the above reference.)
FIND_PROGRAM(PYTHON_EXECUTABLE
- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+ NAMES python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
Index: cmake-2.8.2/Modules/FindPythonLibs.cmake
===================================================================
--- cmake-2.8.2.orig/Modules/FindPythonLibs.cmake 2010-06-28 17:15:57.000000000 +0200
+++ cmake-2.8.2/Modules/FindPythonLibs.cmake 2010-09-07 11:48:34.313260226 +0200
@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks)
# Search for the python framework on Apple.
CMAKE_FIND_FRAMEWORKS(Python)
-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5)
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION})
IF(WIN32)
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY

9
cmake.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Nov 4 11:09:03 UTC 2010 - puzel@novell.com
- update to cmake-2.8.3
- see /usr/share/doc/packages/cmake/Changelog for changes
- drop cmake-FindGTK2-gdk-pixbuf.patch (fixed upstream)
- drop cmake-support-new-python.diff (fixed upstream)
- add cmake-no-system-libarchive.patch
-------------------------------------------------------------------
Tue Sep 14 12:39:36 UTC 2010 - puzel@novell.com

8
cmake.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package cmake (Version 2.8.2)
# spec file for package cmake (Version 2.8.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,7 +19,7 @@
Name: cmake
Version: 2.8.2
Version: 2.8.3
Release: 3
License: BSD3c
Group: Development/Tools/Building
@ -27,9 +27,8 @@ Url: http://www.cmake.org/
Source0: %{name}-%{version}.tar.bz2
Patch4: cmake-disable-builtin-chrpath.diff
Patch5: fortify-buffer-overflows.diff
Patch6: cmake-support-new-python.diff
Patch6: cmake-no-system-libarchive.patch
# Should appear in cmake-2.8.3
Patch7: cmake-FindGTK2-gdk-pixbuf.patch
Summary: Cross-platform, open-source make system
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
@ -59,7 +58,6 @@ Authors:
%patch4
%patch5
%patch6 -p1
%patch7 -p1
%build
export CXXFLAGS="$RPM_OPT_FLAGS"