Accepting request 52840 from devel:tools:building

Accepted submit request 52840 from user puzel

OBS-URL: https://build.opensuse.org/request/show/52840
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=43

cmake-2.8.2.tar.bz2

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

cmake-2.8.3.tar.bz2

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

cmake-FindGTK2-gdk-pixbuf.patch

@@ -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)

cmake-gui.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Nov 11 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)
+
 -------------------------------------------------------------------
 Mon Sep 13 18:09:02 UTC 2010 - kkaempf@novell.com
 

cmake-gui.spec

@@ -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
@@ -40,6 +40,7 @@ BuildRequires:  expat-devel
 BuildRequires:  curl-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libqt4-devel
+BuildRequires:  libarchive-devel
 BuildRequires:  openssl-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel

cmake-support-new-python.diff

@@ -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

cmake.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Nov 11 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)
+
 -------------------------------------------------------------------
 Tue Sep 14 12:39:36 UTC 2010 - puzel@novell.com
 

cmake.spec

@@ -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,7 @@ 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
 # 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}
@@ -42,6 +40,7 @@ BuildRequires:  expat-devel
 %endif
 BuildRequires:  curl-devel
 BuildRequires:  gcc-c++
+BuildRequires:  libarchive-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
@@ -58,8 +57,6 @@ Authors:
 %setup -q -n %{name}-%{version}
 %patch4
 %patch5
-%patch6 -p1
-%patch7 -p1
 
 %build
 export CXXFLAGS="$RPM_OPT_FLAGS"