Djam/cmake
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/cmake.git synced 2025-02-23 23:02:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LOG New version 2.8.11.2

Browse source
This commit is contained in:
Andrey Bondrov 2013-08-15 22:35:28 +11:00
parent ec8fc9bdc4
commit 9853b7aad9
7 changed files with 97 additions and 306 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources: sources:
"cmake-2.8.9.tar.gz": b96663c0757a5edfbddc410aabf7126a92131e2b cmake-2.8.11.2.tar.gz: 31f217c9305add433e77eff49a6eac0047b9e929

24
0001-Fix-FLTK-Find-path.patch Normal file
View file

@ -0,0 +1,24 @@
From bfd04106187a46bdb386d9d189259c7b492f31fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <neoclust.kde@free.fr>
Date: Sat, 27 Oct 2012 02:06:21 +0200
Subject: [PATCH 1/3] Fix FLTK Find path
---
Modules/FindFLTK.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake
index 0611cf0..fbb1183 100644
--- a/Modules/FindFLTK.cmake
+++ b/Modules/FindFLTK.cmake
@@ -101,6 +101,7 @@ if(NOT FLTK_DIR)
PATHS
# Look in standard UNIX install locations.
+ /usr/lib/FLTK-1.1
/usr/local/lib/fltk
/usr/lib/fltk
/usr/local/fltk
--
1.8.0

25
0003-Disable-Test198.patch Normal file
View file

@ -0,0 +1,25 @@
From f63927b7e22538194b69e81d5a7b95d0eed6adc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <neoclust.kde@free.fr>
Date: Sat, 27 Oct 2012 02:18:02 +0200
Subject: [PATCH 3/3] Disable Test198
---
Tests/CMakeOnly/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index 51a630f..0ce5463 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -25,7 +25,7 @@ if(CMAKE_Fortran_COMPILER)
add_CMakeOnly_test(CompilerIdFortran)
endif()
-add_CMakeOnly_test(AllFindModules)
+#add_CMakeOnly_test(AllFindModules)
add_CMakeOnly_test(SelectLibraryConfigurations)
--
1.8.0

19
0003-FindImageMagick-part3.patch Normal file
View file

@ -0,0 +1,19 @@
--- cmake-2.8.10.2/Modules/FindImageMagick.cmake.bero 2013-05-16 18:31:33.919975164 +0200
+++ cmake-2.8.10.2/Modules/FindImageMagick.cmake 2013-05-16 18:40:19.856400054 +0200
@@ -73,12 +73,16 @@
# Helper functions
#---------------------------------------------------------------------
function(FIND_IMAGEMAGICK_API component header)
+ find_package(PkgConfig QUIET)
+ pkg_check_modules(PC_ImageMagick_${component} ${component})
set(ImageMagick_${component}_FOUND FALSE PARENT_SCOPE)
find_path(ImageMagick_${component}_INCLUDE_DIR
NAMES ${header}
PATHS
${ImageMagick_INCLUDE_DIRS}
+ ${PC_ImageMagick_${component}_INCLUDEDIR}
+ ${PC_ImageMagick_${component}_INCLUDE_DIRS}
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include"
PATH_SUFFIXES
ImageMagick

11
cmake-2.8.9-fltk-path.patch
View file

@ -1,11 +0,0 @@
diff -urN cmake-2.8.9/Modules/FindFLTK.cmake cmake-2.8.9-patched/Modules/FindFLTK.cmake
--- cmake-2.8.9/Modules/FindFLTK.cmake 2012-08-10 05:15:19.000000000 +1100
+++ cmake-2.8.9-patched/Modules/FindFLTK.cmake 2012-09-05 22:15:19.522508032 +1100
@@ -99,6 +99,7 @@
${FLTK_DIR_SEARCH}
# Look in standard UNIX install locations.
+ /usr/lib/FLTK-1.1
/usr/local/lib/fltk
/usr/lib/fltk
/usr/local/fltk

273
cmake-2.8.9-xz-support.patch
View file

@ -1,273 +0,0 @@
diff -urN cmake-2.8.9/Modules/CPack.cmake cmake-2.8.9-patched/Modules/CPack.cmake
--- cmake-2.8.9/Modules/CPack.cmake 2012-08-10 05:15:19.000000000 +1100
+++ cmake-2.8.9-patched/Modules/CPack.cmake 2012-09-05 22:20:50.938508000 +1100
@@ -432,6 +432,7 @@
option(CPACK_BINARY_STGZ "Enable to build STGZ packages" ON)
option(CPACK_BINARY_TGZ "Enable to build TGZ packages" ON)
option(CPACK_BINARY_TBZ2 "Enable to build TBZ2 packages" OFF)
+ option(CPACK_BINARY_TXZ "Enable to build TXZ packages" OFF)
option(CPACK_BINARY_DEB "Enable to build Debian packages" OFF)
option(CPACK_BINARY_RPM "Enable to build RPM packages" OFF)
option(CPACK_BINARY_NSIS "Enable to build NSIS packages" OFF)
@@ -452,6 +453,7 @@
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_STGZ STGZ)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TGZ TGZ)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TBZ2 TBZ2)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TXZ TXZ)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TZ TZ)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_ZIP ZIP)
@@ -465,6 +467,7 @@
else(CYGWIN)
option(CPACK_SOURCE_TBZ2 "Enable to build TBZ2 source packages" ON)
option(CPACK_SOURCE_TGZ "Enable to build TGZ source packages" ON)
+ option(CPACK_SOURCE_TXZ "Enable to build TXZ source packages" ON)
option(CPACK_SOURCE_TZ "Enable to build TZ source packages" ON)
option(CPACK_SOURCE_ZIP "Enable to build ZIP source packages" OFF)
endif(CYGWIN)
@@ -475,6 +478,7 @@
cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_CYGWIN CygwinSource)
cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TGZ TGZ)
cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TBZ2 TBZ2)
+ cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TXZ TXZ)
cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TZ TZ)
cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_ZIP ZIP)
endif(NOT CPACK_SOURCE_GENERATOR)
@@ -485,7 +489,7 @@
CPACK_BINARY_DEB CPACK_BINARY_RPM CPACK_BINARY_TZ
CPACK_BINARY_NSIS CPACK_BINARY_ZIP CPACK_BINARY_BUNDLE
CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ
- CPACK_SOURCE_TZ CPACK_SOURCE_ZIP CPACK_BINARY_DRAGNDROP)
+ CPACK_SOURCE_TXZ CPACK_SOURCE_TZ CPACK_SOURCE_ZIP CPACK_BINARY_DRAGNDROP)
# Set some other variables
cpack_set_if_not_set(CPACK_INSTALL_CMAKE_PROJECTS
diff -urN cmake-2.8.9/Modules/FindLibLZMA.cmake cmake-2.8.9-patched/Modules/FindLibLZMA.cmake
--- cmake-2.8.9/Modules/FindLibLZMA.cmake 2012-08-10 05:15:19.000000000 +1100
+++ cmake-2.8.9-patched/Modules/FindLibLZMA.cmake 2012-09-05 22:20:50.946508000 +1100
@@ -2,6 +2,55 @@
# Find LibLZMA headers and library
#
# LIBLZMA_FOUND - True if liblzma is found.
+# LIBLZMA_INCLUDE_DIR - Directory where liblzma headers are located.
+# LIBLZMA_LIBRARIES - Lzma libraries to link against.
+# LIBLZMA_HAS_AUTO_DECODER - True if lzma_auto_decoder() is found (required).
+# LIBLZMA_HAS_EASY_ENCODER - True if lzma_easy_encoder() is found (required).
+# LIBLZMA_HAS_LZMA_PRESET - True if lzma_lzma_preset() is found (required).
+
+
+#=============================================================================
+# Copyright 2008-2009 Per Øyvind Karlsen <peroyvind@mandriva.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+IF (LIBLZMA_INCLUDE_DIRS AND LIBLZMA_LIBRARIES)
+ SET(LIBLZMA_FIND_QUIETLY TRUE)
+ENDIF (LIBLZMA_INCLUDE_DIRS AND LIBLZMA_LIBRARIES)
+
+IF (NOT WIN32)
+ INCLUDE(FindPkgConfig)
+ PKG_SEARCH_MODULE(LIBLZMA liblzma)
+ ELSE (NOT WIN32)
+ FIND_PATH(LIBLZMA_INCLUDE_DIRS lzma.h )
+ FIND_LIBRARY(LIBLZMA_LIBRARIES NAMES lzma )
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBLZMA DEFAULT_MSG LIBLZMA_INCLUDE_DIRS LIBLZMA_LIBRARIES)
+ENDIF (NOT WIN32)
+
+IF (LIBLZMA_FOUND)
+ INCLUDE(CheckLibraryExists)
+ CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARIES} lzma_auto_decoder "" LIBLZMA_HAS_AUTO_DECODER)
+ CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARIES} lzma_easy_encoder "" LIBLZMA_HAS_EASY_ENCODER)
+ CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARIES} lzma_lzma_preset "" LIBLZMA_HAS_LZMA_PRESET)
+ IF (NOT LIBLZMA_HAS_AUTO_DECODER AND LIBLZMA_HAS_EASY_ENCODER AND LIBLZMA_HAS_LZMA_PRESET)
+ SET(LIBLZMA_FOUND FALSE)
+ ENDIF(NOT LIBLZMA_HAS_AUTO_DECODER AND LIBLZMA_HAS_EASY_ENCODER AND LIBLZMA_HAS_LZMA_PRESET)
+ENDIF (LIBLZMA_FOUND)
+
+MARK_AS_ADVANCED( LIBLZMA_INCLUDE_DIRS LIBLZMA_LIBRARIES )
+# - Find LibLZMA
+# Find LibLZMA headers and library
+#
+# LIBLZMA_FOUND - True if liblzma is found.
# LIBLZMA_INCLUDE_DIRS - Directory where liblzma headers are located.
# LIBLZMA_LIBRARIES - Lzma libraries to link against.
# LIBLZMA_HAS_AUTO_DECODER - True if lzma_auto_decoder() is found (required).
diff -urN cmake-2.8.9/Source/CMakeLists.txt cmake-2.8.9-patched/Source/CMakeLists.txt
--- cmake-2.8.9/Source/CMakeLists.txt 2012-08-10 05:15:19.000000000 +1100
+++ cmake-2.8.9-patched/Source/CMakeLists.txt 2012-09-05 22:20:50.946508000 +1100
@@ -478,6 +478,7 @@
CPack/cmCPackTGZGenerator.cxx
CPack/cmCPackTarBZip2Generator.cxx
CPack/cmCPackTarCompressGenerator.cxx
+ CPack/cmCPackTarXZGenerator.cxx
CPack/cmCPackZIPGenerator.cxx
CPack/cmCPackDocumentVariables.cxx
CPack/cmCPackDocumentMacros.cxx
diff -urN cmake-2.8.9/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.9-patched/Source/CPack/cmCPackGeneratorFactory.cxx
--- cmake-2.8.9/Source/CPack/cmCPackGeneratorFactory.cxx 2012-08-10 05:15:19.000000000 +1100
+++ cmake-2.8.9-patched/Source/CPack/cmCPackGeneratorFactory.cxx 2012-09-05 22:25:46.341507898 +1100
@@ -16,6 +16,7 @@
#include "cmCPackTGZGenerator.h"
#include "cmCPackTarBZip2Generator.h"
#include "cmCPackTarCompressGenerator.h"
+#include "cmCPackTarXZGenerator.h"
#include "cmCPackZIPGenerator.h"
#include "cmCPackSTGZGenerator.h"
#include "cmCPackNSISGenerator.h"
@@ -85,6 +86,11 @@
this->RegisterGenerator("TBZ2", "Tar BZip2 compression",
cmCPackTarBZip2Generator::CreateGenerator);
}
+ if (cmCPackTarXZGenerator::CanGenerate())
+ {
+ this->RegisterGenerator("TXZ", "Tar XZ compression",
+ cmCPackTarXZGenerator::CreateGenerator);
+ }
if (cmCPackTarCompressGenerator::CanGenerate())
{
this->RegisterGenerator("TZ", "Tar Compress compression",
diff -urN cmake-2.8.9/Source/CPack/cmCPackTarXZGenerator.cxx cmake-2.8.9-patched/Source/CPack/cmCPackTarXZGenerator.cxx
--- cmake-2.8.9/Source/CPack/cmCPackTarXZGenerator.cxx 1970-01-01 10:00:00.000000000 +1000
+++ cmake-2.8.9-patched/Source/CPack/cmCPackTarXZGenerator.cxx 2012-09-05 22:20:50.953508000 +1100
@@ -0,0 +1,31 @@
+/*=========================================================================
+
+ Program: CMake - Cross-Platform Makefile Generator
+ Module: $RCSfile: cmCPackTarXZGenerator.cxx,v $
+ Language: C++
+ Date: $Date: 2011-05-06 19:02:00 $
+ Version: $Revision: 1.0 $
+
+ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved.
+ See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+#include "cmCPackTarXZGenerator.h"
+
+//----------------------------------------------------------------------
+cmCPackTarXZGenerator::cmCPackTarXZGenerator()
+ :cmCPackArchiveGenerator(cmArchiveWrite::CompressXZ,
+ cmArchiveWrite::TypeTAR)
+{
+}
+
+//----------------------------------------------------------------------
+cmCPackTarXZGenerator::~cmCPackTarXZGenerator()
+{
+}
+
diff -urN cmake-2.8.9/Source/CPack/cmCPackTarXZGenerator.h cmake-2.8.9-patched/Source/CPack/cmCPackTarXZGenerator.h
--- cmake-2.8.9/Source/CPack/cmCPackTarXZGenerator.h 1970-01-01 10:00:00.000000000 +1000
+++ cmake-2.8.9-patched/Source/CPack/cmCPackTarXZGenerator.h 2012-09-05 22:20:50.953508000 +1100
@@ -0,0 +1,39 @@
+/*=========================================================================
+
+ Program: CMake - Cross-Platform Makefile Generator
+ Module: $RCSfile: cmCPackTarXZGenerator.h,v $
+ Language: C++
+ Date: $Date: 2007-02-02 19:40:26 $
+ Version: $Revision: 1.2 $
+
+ Copyright (c) 2002 Kitware, Inc. All rights reserved.
+ See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
+
+#ifndef cmCPackTarXZGenerator_h
+#define cmCPackTarXZGenerator_h
+
+#include "cmCPackArchiveGenerator.h"
+
+/** \class cmCPackTarXZGenerator
+ * \brief A generator for TarXZ files
+ */
+class cmCPackTarXZGenerator : public cmCPackArchiveGenerator
+{
+public:
+ cmCPackTypeMacro(cmCPackTarXZGenerator, cmCPackArchiveGenerator);
+ /**
+ * Construct generator
+ */
+ cmCPackTarXZGenerator();
+ virtual ~cmCPackTarXZGenerator();
+protected:
+ virtual const char* GetOutputExtension() { return ".tar.xz"; }
+};
+
+#endif
diff -urN cmake-2.8.9/Tests/CMakeTests/ModuleNoticesTest.cmake.in cmake-2.8.9-patched/Tests/CMakeTests/ModuleNoticesTest.cmake.in
--- cmake-2.8.9/Tests/CMakeTests/ModuleNoticesTest.cmake.in 2012-08-10 05:15:19.000000000 +1100
+++ cmake-2.8.9-patched/Tests/CMakeTests/ModuleNoticesTest.cmake.in 2012-09-05 22:20:50.954508000 +1100
@@ -22,6 +22,7 @@
# Modules that do not require our notice.
set(notice_exceptions
FindCUDA.cmake # MIT License, distributed here from upstream project
+ FindLibLZMA.cmake # Mandriva own patch, do not copyright by Kitware
)
# Load the list of modules to check.
diff -urN cmake-2.8.9/Tests/SimpleInstall/CMakeLists.txt cmake-2.8.9-patched/Tests/SimpleInstall/CMakeLists.txt
--- cmake-2.8.9/Tests/SimpleInstall/CMakeLists.txt 2012-08-10 05:15:19.000000000 +1100
+++ cmake-2.8.9-patched/Tests/SimpleInstall/CMakeLists.txt 2012-09-05 22:20:50.955508000 +1100
@@ -359,6 +359,11 @@
IF(found_bz2)
SET(CPACK_GENERATOR "${CPACK_GENERATOR};TBZ2")
ENDIF(found_bz2)
+ FIND_PROGRAM(found_xz
+ NAMES xz)
+ IF(found_xz)
+ SET(CPACK_GENERATOR "${CPACK_GENERATOR};TXZ")
+ ENDIF(found_xz)
ENDIF(UNIX AND NOT APPLE)
SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
diff -urN cmake-2.8.9/Tests/SimpleInstallS2/CMakeLists.txt cmake-2.8.9-patched/Tests/SimpleInstallS2/CMakeLists.txt
--- cmake-2.8.9/Tests/SimpleInstallS2/CMakeLists.txt 2012-08-10 05:15:19.000000000 +1100
+++ cmake-2.8.9-patched/Tests/SimpleInstallS2/CMakeLists.txt 2012-09-05 22:20:50.955508000 +1100
@@ -359,6 +359,11 @@
IF(found_bz2)
SET(CPACK_GENERATOR "${CPACK_GENERATOR};TBZ2")
ENDIF(found_bz2)
+ FIND_PROGRAM(found_xz
+ NAMES xz)
+ IF(found_xz)
+ SET(CPACK_GENERATOR "${CPACK_GENERATOR};TXZ")
+ ENDIF(found_xz)
ENDIF(UNIX AND NOT APPLE)
SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
diff -urN cmake-2.8.9/Utilities/Release/release_cmake.cmake cmake-2.8.9-patched/Utilities/Release/release_cmake.cmake
--- cmake-2.8.9/Utilities/Release/release_cmake.cmake 2012-08-10 05:15:19.000000000 +1100
+++ cmake-2.8.9-patched/Utilities/Release/release_cmake.cmake 2012-09-05 22:20:50.955508000 +1100
@@ -100,6 +100,13 @@
set(SUFFIXES ${SUFFIXES} "*.tar.bz2")
set(extra_files setup.hint)
endif("${gen}" MATCHES "Cygwin")
+ if("${gen}" STREQUAL "TXZ")
+ set(SUFFIXES ${SUFFIXES} "*.tar.xz")
+ endif("${gen}" STREQUAL "TXZ")
+ if("${gen}" MATCHES "Cygwin")
+ set(SUFFIXES ${SUFFIXES} "*.tar.xz")
+ set(extra_files setup.hint)
+ endif("${gen}" MATCHES "Cygwin")
if("${gen}" STREQUAL "TZ")
set(SUFFIXES ${SUFFIXES} "*.tar.Z")
endif("${gen}" STREQUAL "TZ")

49
cmake.spec
View file

@ -1,11 +1,11 @@
%define shortVersion %(echo %{version} | cut -d. -f1,2) %define shortVersion %(echo %{version} | cut -d. -f1,2)
%define qt4 0 %bcond_with bootstrap
Name: cmake
Summary: Cross-platform, open-source make system Summary: Cross-platform, open-source make system
Version: 2.8.9 Name: cmake
Release: 1 Version: 2.8.11.2
Release: 2
Epoch: 1 Epoch: 1
License: BSD License: BSD
Group: Development/Other Group: Development/Other
@ -13,22 +13,23 @@ Url: http://www.cmake.org/HTML/index.html
Source0: http://www.cmake.org/files/v%{shortVersion}/%{name}-%{version}.tar.gz Source0: http://www.cmake.org/files/v%{shortVersion}/%{name}-%{version}.tar.gz
Source1: cmake.macros Source1: cmake.macros
# fix ftlk detection # fix ftlk detection
Patch1: cmake-2.8.9-fltk-path.patch Patch1: 0001-Fix-FLTK-Find-path.patch
Patch2: cmake-2.8.9-xz-support.patch Patch3: 0003-Disable-Test198.patch
# Fix ImageMagick detection (not upstream yet; parts 1 and 2 are)
Patch6: 0003-FindImageMagick-part3.patch
BuildRequires: perl BuildRequires: perl
BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(ncurses)
BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcurl)
BuildRequires: idn-devel BuildRequires: pkgconfig(libidn)
BuildRequires: zlib-devel BuildRequires: pkgconfig(zlib)
BuildRequires: xz BuildRequires: xz
BuildRequires: expat-devel BuildRequires: pkgconfig(expat)
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: libarchive-devel BuildRequires: pkgconfig(libarchive)
%if %qt4 %if !%{with bootstrap}
BuildRequires: qt4-devel >= 4.4.0 BuildRequires: pkgconfig(QtCore)
%endif %endif
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
Requires: rpm-manbo-setup >= 2-10
%description %description
CMake is used to control the software compilation process using CMake is used to control the software compilation process using
@ -55,19 +56,19 @@ generation, and template instantiation.
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
%if %qt4 %if !%{with bootstrap}
%package -n %{name}-qtgui %package -n %{name}-qtgui
Summary: Qt GUI Dialog for CMake - the Cross-platform, open-source make system Summary: Qt GUI Dialog for CMake - the Cross-platform, open-source make system
Group: Development/Other Group: Development/Other
Requires: %{name} Requires: %{name}
%description -n %{name}-qtgui %description -n %{name}-qtgui
CMake is used to control the software compilation process using CMake is used to control the software compilation process using
simple platform and compiler independent configuration files. simple platform and compiler independent configuration files.
This is the Qt GUI. This is the Qt GUI.
%files -n %{name}-qtgui %files -n %{name}-qtgui
%{_bindir}/cmake-gui %{_bindir}/cmake-gui
%{_datadir}/applications/CMake.desktop %{_datadir}/applications/CMake.desktop
%{_datadir}/mime/packages/cmakecache.xml %{_datadir}/mime/packages/cmakecache.xml
@ -78,8 +79,7 @@ This is the Qt GUI.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %apply_patches
%patch2 -p1 -b .xz~
# Don't try to automagically find files in /usr/X11R6 # Don't try to automagically find files in /usr/X11R6
# But also don't change a prefix if it is not /usr # But also don't change a prefix if it is not /usr
@ -101,7 +101,7 @@ cd build
--datadir=/share/%{name} \ --datadir=/share/%{name} \
--mandir=/share/man \ --mandir=/share/man \
--docdir=/share/doc/%{name} \ --docdir=/share/doc/%{name} \
%if %qt4 %if !%{with bootstrap}
--qt-gui --qt-gui
%endif %endif
@ -134,7 +134,14 @@ install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/rpm/macros.d/cmake.macros
rm -rf mydocs rm -rf mydocs
mv %{buildroot}%{_datadir}/doc/%{name} mydocs mv %{buildroot}%{_datadir}/doc/%{name} mydocs
# As of 2.8.10.2, the test suite needs net access.
# Absent that, it will fail:
# The following tests FAILED:
# 186 - CTestTestFailedSubmit-http (Failed)
# 187 - CTestTestFailedSubmit-https (Failed)
%if 0
%check %check
unset DISPLAY unset DISPLAY
cd build cd build
#bin/ctest -E SubDirSpaces -V %{_smp_mflags} bin/ctest -E SubDirSpaces -V %{_smp_mflags}
%endif