From efc7ecc69e4507624791d5f12f79fd9fdacbed41036ec4950b47850196291b8d Mon Sep 17 00:00:00 2001 From: Petr Uzel Date: Tue, 14 Sep 2010 12:42:51 +0000 Subject: [PATCH 1/3] fix bug 635439 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=67 --- cmake-FindGTK2-gdk-pixbuf.patch | 22 ++++++++++++++++++++++ cmake.changes | 5 +++++ cmake.spec | 3 +++ 3 files changed, 30 insertions(+) create mode 100644 cmake-FindGTK2-gdk-pixbuf.patch diff --git a/cmake-FindGTK2-gdk-pixbuf.patch b/cmake-FindGTK2-gdk-pixbuf.patch new file mode 100644 index 0000000..4768011 --- /dev/null +++ b/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) diff --git a/cmake.changes b/cmake.changes index 03ae39d..670742e 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 14 12:39:36 UTC 2010 - puzel@novell.com + +- add cmake-FindGTK2-gdk-pixbuf.patch (bnc#635439) + ------------------------------------------------------------------- Tue Sep 7 08:57:01 UTC 2010 - coolo@novell.com diff --git a/cmake.spec b/cmake.spec index f2dc511..d0c7329 100644 --- a/cmake.spec +++ b/cmake.spec @@ -28,6 +28,8 @@ 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} > 1110 @@ -53,6 +55,7 @@ Authors: %patch4 %patch5 %patch6 -p1 +%patch7 -p1 %build export CXXFLAGS="$RPM_OPT_FLAGS" From 303192ae2e8ef6085fb93c9a2436ffca6adbda699aa3d5e6a7a6b5d0e152f9e7 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 14 Sep 2010 14:03:41 +0000 Subject: [PATCH 2/3] Accepting request 48120 from systemsmanagement:wbem OBS-URL: https://build.opensuse.org/request/show/48120 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=68 --- cmake-gui.changes | 5 +++++ cmake-gui.spec | 12 +++++++++--- cmake.changes | 5 +++++ cmake.spec | 6 +++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index 0743391..3ba8931 100644 --- a/cmake-gui.changes +++ b/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 diff --git a/cmake-gui.spec b/cmake-gui.spec index 4fee62e..32165f1 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -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 -BuildRequires: fdupes -BuildRequires: gcc-c++ +%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: libqt4-devel BuildRequires: openssl-devel BuildRequires: update-desktop-files diff --git a/cmake.changes b/cmake.changes index 670742e..5a78c6b 100644 --- a/cmake.changes +++ b/cmake.changes @@ -3,6 +3,11 @@ 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 diff --git a/cmake.spec b/cmake.spec index d0c7329..8aaa52d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -32,12 +32,16 @@ Patch6: cmake-support-new-python.diff 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 From cd3c91628294ddc41f376241398e5cc4fff473fea82b40b0bdd44c3691bbf275 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 17 Sep 2010 19:03:28 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/cmake revision 42.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=20a266049dca49cd038a0a3769a9e076 --- cmake-gui.spec | 2 +- cmake.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake-gui.spec b/cmake-gui.spec index 32165f1..b3d1e6a 100644 --- a/cmake-gui.spec +++ b/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/ diff --git a/cmake.spec b/cmake.spec index 8aaa52d..cdc1839 100644 --- a/cmake.spec +++ b/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/