Accepting request 48122 from devel:tools:building

Copy from devel:tools:building/cmake based on submit request 48122 from user coolo

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

cmake-FindGTK2-gdk-pixbuf.patch

@@ -0,0 +1,22 @@
+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,8 @@
+-------------------------------------------------------------------
+Mon Sep 13 18:09:02 UTC 2010 - kkaempf@novell.com
+
+- fix build on RHEL/Fedora
+
 -------------------------------------------------------------------
 Tue Jul 20 20:37:51 UTC 2010 - puzel@novell.com
 

cmake-gui.spec

@@ -20,7 +20,7 @@
 
 Name:           cmake-gui
 Version:        2.8.2
-Release:        2
+Release:        3
 License:        BSD3c
 Group:          Development/Tools/Building
 Url:            http://www.cmake.org/
@@ -29,10 +29,16 @@ Patch4:         cmake-disable-builtin-chrpath.diff
 Patch5:         fortify-buffer-overflows.diff
 Summary:        CMake graphical user interface
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  curl-devel
+%if 0%{?suse_version}
-BuildRequires:  fdupes
-BuildRequires:  gcc-c++
 BuildRequires:  libexpat-devel
+%if 0%{?suse_version} > 1110
+BuildRequires:  fdupes
+%endif
+%else
+BuildRequires:  expat-devel
+%endif
+BuildRequires:  curl-devel
+BuildRequires:  gcc-c++
 BuildRequires:  libqt4-devel
 BuildRequires:  openssl-devel
 BuildRequires:  update-desktop-files

cmake.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Sep 14 12:39:36 UTC 2010 - puzel@novell.com
+
+- add cmake-FindGTK2-gdk-pixbuf.patch (bnc#635439) 
+
+-------------------------------------------------------------------
+Mon Sep 13 18:09:02 UTC 2010 - kkaempf@novell.com
+
+- fix build on RHEL/Fedora
+
 -------------------------------------------------------------------
 Tue Sep  7 08:57:01 UTC 2010 - coolo@novell.com
 

cmake.spec

@@ -20,7 +20,7 @@
 
 Name:           cmake
 Version:        2.8.2
-Release:        2
+Release:        3
 License:        BSD3c
 Group:          Development/Tools/Building
 Url:            http://www.cmake.org/
@@ -28,14 +28,20 @@ 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}
+BuildRequires:  libexpat-devel
 %if 0%{?suse_version} > 1110
 BuildRequires:  fdupes
 %endif
+%else
+BuildRequires:  expat-devel
+%endif
 BuildRequires:  curl-devel
 BuildRequires:  gcc-c++
-BuildRequires:  libexpat-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
@@ -53,6 +59,7 @@ Authors:
 %patch4
 %patch5
 %patch6 -p1
+%patch7 -p1
 
 %build
 export CXXFLAGS="$RPM_OPT_FLAGS"