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