openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project1.diff of Package cmake (Revision e7ed91e0d476ff4b967719498862fe9b)

Currently displaying revision e7ed91e0d476ff4b967719498862fe9b , Show latest

--- cmake-gui.changes.orig
+++ cmake-gui.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+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
 
 - update to cmake-gui-2.8.2 
--- cmake-gui.spec.orig
+++ cmake-gui.spec
@@ -29,10 +29,16 @@ Patch4:         cmake-disable-builtin-ch
 Patch5:         fortify-buffer-overflows.diff
 Summary:        CMake graphical user interface
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  curl-devel
+%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:  libqt4-devel
 BuildRequires:  openssl-devel
 BuildRequires:  update-desktop-files
--- cmake.changes.orig
+++ cmake.changes
@@ -4,6 +4,11 @@ Tue Sep 14 12:39:36 UTC 2010 - puzel@nov
 - 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
 
 - support new python 2.7
--- cmake.spec.orig
+++ cmake.spec
@@ -32,12 +32,16 @@ Patch6:         cmake-support-new-python
 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

Places

File project1.diff of Package cmake (Revision e7ed91e0d476ff4b967719498862fe9b)

Places