From 3bca3fb7f4845c7298c34b2efc0fa7236f69dcaa42ede56ffdb69e95b2fc3a1e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 22 Jun 2008 00:01:47 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=18 --- cmake.changes | 5 +++++ cmake.spec | 37 +++++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/cmake.changes b/cmake.changes index 28f3533..8c76e88 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +Thu Jun 12 17:59:52 CEST 2008 - mrdocs@opensuse.org + +- add %ifdefs to disable the cmake gui for non-Suse distros +- SLES 9 does not build, but its a compile failure + ------------------------------------------------------------------- Fri May 9 10:11:57 CEST 2008 - dmueller@suse.de diff --git a/cmake.spec b/cmake.spec index 1653ca6..7b8f03d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -13,22 +13,10 @@ Name: cmake Version: 2.6.0 -Release: 9 +Release: 18 License: BSD 3-Clause Group: Development/Tools/Building %define tar_version 2.6.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} -%if %suse_version > 1020 -BuildRequires: libexpat-devel -%else -BuildRequires: expat -%endif -%else -BuildRequires: expat-devel -%endif -BuildRequires: curl-devel expat gcc-c++ ncurses-devel openssl-devel -BuildRequires: libqt4-devel update-desktop-files zlib-devel Url: http://www.cmake.org/ Source0: %{name}-%{tar_version}.tar.bz2 Patch0: cmake-2.6.0-use_intree_xmlrpc.patch @@ -37,6 +25,11 @@ Patch2: cmake-2.6.0-use_shared_python_lib.patch Patch4: cmake-disable-builtin-chrpath.diff Patch5: cmake-2.6.0-fix_ctest_coverage.patch Summary: Cross-platform, open-source make system +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1020 +BuildRequires: libexpat-devel libqt4-devel update-desktop-files +%endif +BuildRequires: curl-devel expat gcc-c++ ncurses-devel openssl-devel zlib-devel Requires: make %description @@ -48,6 +41,8 @@ Authors: -------- Kitware, Inc., Insight Consortium +%if 0%{?suse_version} >= 1020 + %package gui License: BSD 3-Clause Summary: CMake Graphical User Interface @@ -63,6 +58,8 @@ Authors: -------- Kitware, Inc., Insight Consortium +%endif + %prep %setup -q -n %name-%tar_version %patch0 @@ -73,6 +70,10 @@ Authors: %patch5 %build +EXTRA_FLAGS="" +%if 0%{?suse_version} >= 1020 + EXTRA_FLAGS="--qt-gui" +%endif export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$CXXFLAGS" ./configure \ @@ -81,14 +82,13 @@ export CFLAGS="$CXXFLAGS" --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ --system-libs \ - --parallel=0%jobs \ - --qt-gui + --parallel=0%jobs $EXTRA_FLAGS make VERBOSE=1 %{?jobs:-j %jobs} %install make DESTDIR=%{buildroot} install find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644 -%if 0%suse_version +%if 0%{?suse_version} >= 1020 %suse_update_desktop_file CMake Development IDE Tools Qt %endif @@ -112,6 +112,7 @@ rm -rf %{buildroot} %doc %_mandir/man1/cmakeprops.1.* %doc %_mandir/man1/cmakevars.1.* %doc %_mandir/man1/cpack.1.* +%if 0%{?suse_version} >= 1020 %files gui %defattr(-,root,root) @@ -119,8 +120,12 @@ rm -rf %{buildroot} /usr/share/applications/CMake.desktop /usr/share/mime/packages/cmakecache.xml /usr/share/pixmaps/CMakeSetup.png +%endif %changelog +* Thu Jun 12 2008 mrdocs@opensuse.org +- add %%ifdefs to disable the cmake gui for non-Suse distros +- SLES 9 does not build, but its a compile failure * Fri May 09 2008 dmueller@suse.de - fix ctest reporting (kitware#6988), patch by Andreas Schneider * Wed May 07 2008 dmueller@suse.de