From d9780f55db0cd6d4a8157a9423147a350a26aaaf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 Sep 2010 10:06:41 -0600 Subject: [PATCH 01/13] - Update to 2.8.3 RC 1 --- .gitignore | 1 + cmake.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5e9430d..6a8c3d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ cmake-2.8.2.tar.gz +/cmake-2.8.3-rc1.tar.gz diff --git a/cmake.spec b/cmake.spec index 476e93c..7c359a0 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver %{nil} +%define rcver -rc1 Name: cmake -Version: 2.8.2 -Release: 2%{?dist} +Version: 2.8.3 +Release: 0.1.rc1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -144,6 +144,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Thu Sep 16 2010 Orion Poplawski - 2.8.3-0.1.rc1 +- Update to 2.8.3 RC 1 + * Fri Jul 23 2010 Kevin Kofler - 2.8.2-2 - add support for Python 2.7 to FindPythonLibs.cmake (Orcan Ogetbil) diff --git a/sources b/sources index d5d6949..f59264a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c967d5264657a798f22ee23976ff0d9 cmake-2.8.2.tar.gz +1ce9e4553ed496eb182bc2687d13b491 cmake-2.8.3-rc1.tar.gz From 221295c864eca0d9f4f1b87b04e755a318a40b74 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 Sep 2010 10:17:21 -0600 Subject: [PATCH 02/13] Add BR bzip2-devel and libarchive-devel --- cmake.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 7c359a0..9eb402e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -24,7 +24,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran BuildRequires: ncurses-devel, libX11-devel -BuildRequires: curl-devel, expat-devel, zlib-devel +BuildRequires: bzip2-devel +BuildRequires: curl-devel +BuildRequires: expat-devel +BuildRequires: libarchive-devel +BuildRequires: zlib-devel %if %{without bootstrap} #BuildRequires: xmlrpc-c-devel %endif @@ -146,6 +150,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog * Thu Sep 16 2010 Orion Poplawski - 2.8.3-0.1.rc1 - Update to 2.8.3 RC 1 +- Add BR bzip2-devel and libarchive-devel * Fri Jul 23 2010 Kevin Kofler - 2.8.2-2 - add support for Python 2.7 to FindPythonLibs.cmake (Orcan Ogetbil) From 27ccb2b934c21cef5f20ed3c57f35225707001b5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 22 Sep 2010 16:44:58 -0600 Subject: [PATCH 03/13] Move cmake-gui man and doc to cmake-gui package --- cmake.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 9eb402e..13a910b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -128,22 +128,35 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/rpm/macros.cmake %{_datadir}/doc/%{name}-%{version}/ +%exclude %{_datadir}/doc/%{name}-%{version}/cmake-gui.* %{_bindir}/ccmake %{_bindir}/cmake %{_bindir}/cpack %{_bindir}/ctest %{_datadir}/%{name}/ -%{_mandir}/man1/*.1* +%{_mandir}/man1/ccmake.1.gz +%{_mandir}/man1/cmake-gui.1.gz +%{_mandir}/man1/cmake.1.gz +%{_mandir}/man1/cmakecommands.1.gz +%{_mandir}/man1/cmakecompat.1.gz +%{_mandir}/man1/cmakemodules.1.gz +%{_mandir}/man1/cmakepolicies.1.gz +%{_mandir}/man1/cmakeprops.1.gz +%{_mandir}/man1/cmakevars.1.gz +%{_mandir}/man1/cpack.1.gz +%{_mandir}/man1/ctest.1.gz %{_datadir}/emacs/ %{_libdir}/%{name}/ %if %{with gui} %files gui %defattr(-,root,root,-) +%{_datadir}/doc/%{name}-%{version}/cmake-gui.* %{_bindir}/cmake-gui %{_datadir}/applications/CMake.desktop %{_datadir}/mime/packages/cmakecache.xml %{_datadir}/pixmaps/CMakeSetup32.png +%{_mandir}/man1/cmake-gui.1.gz %endif From f6887fcf61d4a3822a902f1743cfa445a6b2bbe3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Oct 2010 09:52:58 -0600 Subject: [PATCH 04/13] - Update to 2.8.3 RC 3 --- .gitignore | 1 + cmake.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6a8c3d7..4892812 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ cmake-2.8.2.tar.gz /cmake-2.8.3-rc1.tar.gz +/cmake-2.8.3-rc3.tar.gz diff --git a/cmake.spec b/cmake.spec index 13a910b..94226a4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver -rc1 +%define rcver -rc3 Name: cmake Version: 2.8.3 -Release: 0.1.rc1%{?dist} +Release: 0.2.rc3%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -161,6 +161,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Fri Oct 22 2010 Orion Poplawski - 2.8.3-0.2.rc3 +- Update to 2.8.3 RC 3 + * Thu Sep 16 2010 Orion Poplawski - 2.8.3-0.1.rc1 - Update to 2.8.3 RC 1 - Add BR bzip2-devel and libarchive-devel diff --git a/sources b/sources index f59264a..baa7e9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ce9e4553ed496eb182bc2687d13b491 cmake-2.8.3-rc1.tar.gz +fe11f9493a00b4c36f416a7905471918 cmake-2.8.3-rc3.tar.gz From 88561fd00971507a7a7b0f94119be8a788168306 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 1 Nov 2010 10:20:00 -0600 Subject: [PATCH 05/13] - Update to 2.8.3 RC 4 - Drop python 2.7 patch fixed upstream - No need to fixup source file permissions anymore --- .gitignore | 1 + cmake.spec | 16 +++++++--------- sources | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 4892812..939a615 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.3-rc1.tar.gz /cmake-2.8.3-rc3.tar.gz +/cmake-2.8.3-rc4.tar.gz diff --git a/cmake.spec b/cmake.spec index 94226a4..4116374 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver -rc3 +%define rcver -rc4 Name: cmake Version: 2.8.3 -Release: 0.2.rc3%{?dist} +Release: 0.3.rc4%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -17,9 +17,6 @@ URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source2: macros.cmake -# add support for Python 2.7 to FindPythonLibs.cmake (Orcan Ogetbil) -Patch0: cmake-2.8.2-python27.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran @@ -59,10 +56,6 @@ The %{name}-gui package contains the Qt based GUI for CMake. %prep %setup -q -n %{name}-%{version}%{?rcver} -# Python 2.7 patch (don't use -b as the backup would get installed) -%patch0 -p1 -# Fixup permissions -find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x %build @@ -161,6 +154,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Mon Nov 1 2010 Orion Poplawski - 2.8.3-0.3.rc4 +- Update to 2.8.3 RC 4 +- Drop python 2.7 patch fixed upstream +- No need to fixup source file permissions anymore + * Fri Oct 22 2010 Orion Poplawski - 2.8.3-0.2.rc3 - Update to 2.8.3 RC 3 diff --git a/sources b/sources index baa7e9a..bebae1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe11f9493a00b4c36f416a7905471918 cmake-2.8.3-rc3.tar.gz +80a4d28db3c00608b503388b2e4387c7 cmake-2.8.3-rc4.tar.gz From 2c36e6cccc22709c4a1642910cf79ee0938e347d Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 4 Nov 2010 14:13:32 -0600 Subject: [PATCH 06/13] - Update to 2.8.3 final --- .gitignore | 1 + cmake.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 939a615..ac86f31 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.3-rc1.tar.gz /cmake-2.8.3-rc3.tar.gz /cmake-2.8.3-rc4.tar.gz +/cmake-2.8.3.tar.gz diff --git a/cmake.spec b/cmake.spec index 4116374..86236dd 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver -rc4 +%define rcver %{nil} Name: cmake Version: 2.8.3 -Release: 0.3.rc4%{?dist} +Release: 1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -154,6 +154,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Thu Nov 4 2010 Orion Poplawski - 2.8.3-1 +- Update to 2.8.3 final + * Mon Nov 1 2010 Orion Poplawski - 2.8.3-0.3.rc4 - Update to 2.8.3 RC 4 - Drop python 2.7 patch fixed upstream diff --git a/sources b/sources index bebae1e..0586022 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80a4d28db3c00608b503388b2e4387c7 cmake-2.8.3-rc4.tar.gz +a76a44b93acf5e3badda9de111385921 cmake-2.8.3.tar.gz From ccfe3b798e4f71b49494aecbee81c3a886f73913 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 4 Nov 2010 14:14:38 -0600 Subject: [PATCH 07/13] Remove python27 patch --- cmake-2.8.2-python27.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 cmake-2.8.2-python27.patch diff --git a/cmake-2.8.2-python27.patch b/cmake-2.8.2-python27.patch deleted file mode 100644 index d5be65a..0000000 --- a/cmake-2.8.2-python27.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur cmake-2.8.2/Modules/FindPythonLibs.cmake cmake-2.8.2-python27/Modules/FindPythonLibs.cmake ---- cmake-2.8.2/Modules/FindPythonLibs.cmake 2010-06-28 17:15:57.000000000 +0200 -+++ cmake-2.8.2-python27/Modules/FindPythonLibs.cmake 2010-07-23 20:42:29.000000000 +0200 -@@ -27,7 +27,7 @@ - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) - FIND_LIBRARY(PYTHON_DEBUG_LIBRARY From e647abb348b8814154a0a73d22743c972496127b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 Dec 2010 09:07:14 -0700 Subject: [PATCH 08/13] - Add patch from upstream git to fix bug 652886 (qt3/qt4 detection) --- cmake-2.8.3-qt4.patch | 34 ++++++++++++++++++++++++++++++++++ cmake.spec | 6 ++++++ 2 files changed, 40 insertions(+) create mode 100644 cmake-2.8.3-qt4.patch diff --git a/cmake-2.8.3-qt4.patch b/cmake-2.8.3-qt4.patch new file mode 100644 index 0000000..b759dd5 --- /dev/null +++ b/cmake-2.8.3-qt4.patch @@ -0,0 +1,34 @@ +From cfba5ef111bf86e8820a4dff556b3a9edc1484cd Mon Sep 17 00:00:00 2001 +From: Clinton Stimpson +Date: Fri, 15 Oct 2010 16:36:14 -0600 +Subject: [PATCH] Fix regression in 2dae2f1 which added find of Qt imports dir. + +--- + Modules/FindQt4.cmake | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake +index 45bbd2e..6129329 100644 +--- a/Modules/FindQt4.cmake ++++ b/Modules/FindQt4.cmake +@@ -482,7 +482,7 @@ IF (QT_QMAKE_EXECUTABLE) + _qt4_query_qmake(QT_VERSION QTVERSION) + + # check for qt3 qmake and then try and find qmake4 or qmake-qt4 in the path +- IF("${QTVERSION}" MATCHES "Unknown") ++ IF(NOT QTVERSION) + SET(QT_QMAKE_EXECUTABLE NOTFOUND CACHE FILEPATH "" FORCE) + FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" +@@ -493,7 +493,7 @@ IF (QT_QMAKE_EXECUTABLE) + IF(QT_QMAKE_EXECUTABLE) + _qt4_query_qmake(QT_VERSION QTVERSION) + ENDIF(QT_QMAKE_EXECUTABLE) +- ENDIF("${QTVERSION}" MATCHES "Unknown") ++ ENDIF(NOT QTVERSION) + + # check that we found the Qt4 qmake, Qt3 qmake output won't match here + STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" qt_version_tmp "${QTVERSION}") +-- +1.7.0 + diff --git a/cmake.spec b/cmake.spec index 86236dd..c730c34 100644 --- a/cmake.spec +++ b/cmake.spec @@ -16,6 +16,8 @@ License: BSD URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source2: macros.cmake +#Patch from upstream git to fix bug 652886 +Patch0: cmake-2.8.3-qt4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +58,7 @@ The %{name}-gui package contains the Qt based GUI for CMake. %prep %setup -q -n %{name}-%{version}%{?rcver} +%patch0 -p1 %build @@ -154,6 +157,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Thu Dec 16 2010 Orion Poplawski - 2.8.3-2 +- Add patch from upstream git to fix bug 652886 (qt3/qt4 detection) + * Thu Nov 4 2010 Orion Poplawski - 2.8.3-1 - Update to 2.8.3 final From d070e515ee355f091a5ec49b527ecdf1d292e2dc Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 Dec 2010 09:07:49 -0700 Subject: [PATCH 09/13] Bump release --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index c730c34..fcec42e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ Name: cmake Version: 2.8.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cross-platform make system Group: Development/Tools From 7a78b9f212bcbe70d719773f97fa2b4208b32bb5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 18 Jan 2011 15:27:15 -0700 Subject: [PATCH 10/13] - Update to 2.8.4 RC 1 - Drop qt4 patch --- .gitignore | 1 + cmake.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ac86f31..3bf4c42 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.3-rc3.tar.gz /cmake-2.8.3-rc4.tar.gz /cmake-2.8.3.tar.gz +/cmake-2.8.4-rc1.tar.gz diff --git a/cmake.spec b/cmake.spec index fcec42e..d7a6a5b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver %{nil} +%define rcver -rc1 Name: cmake -Version: 2.8.3 -Release: 2%{?dist} +Version: 2.8.4 +Release: 0.1.rc1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -16,8 +16,6 @@ License: BSD URL: http://www.cmake.org Source0: http://www.cmake.org/files/v2.8/cmake-%{version}%{?rcver}.tar.gz Source2: macros.cmake -#Patch from upstream git to fix bug 652886 -Patch0: cmake-2.8.3-qt4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -58,7 +56,6 @@ The %{name}-gui package contains the Qt based GUI for CMake. %prep %setup -q -n %{name}-%{version}%{?rcver} -%patch0 -p1 %build @@ -157,6 +154,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Tue Jan 18 2011 Orion Poplawski - 2.8.4-0.1.rc1 +- Update to 2.8.4 RC 1 +- Drop qt4 patch + * Thu Dec 16 2010 Orion Poplawski - 2.8.3-2 - Add patch from upstream git to fix bug 652886 (qt3/qt4 detection) diff --git a/sources b/sources index 0586022..a222477 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a76a44b93acf5e3badda9de111385921 cmake-2.8.3.tar.gz +594c207ca1a36034dedb7213da934dd9 cmake-2.8.4-rc1.tar.gz From e5591cdee74bc8cbf5873fa922e5c2b29deec608 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 2 Feb 2011 09:48:48 -0700 Subject: [PATCH 11/13] - Update to 2.8.4 RC 2 --- .gitignore | 1 + cmake.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3bf4c42..ee7a7a2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.3-rc4.tar.gz /cmake-2.8.3.tar.gz /cmake-2.8.4-rc1.tar.gz +/cmake-2.8.4-rc2.tar.gz diff --git a/cmake.spec b/cmake.spec index d7a6a5b..795a0f1 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver -rc1 +%define rcver -rc2 Name: cmake Version: 2.8.4 -Release: 0.1.rc1%{?dist} +Release: 0.2.rc2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -154,6 +154,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Wed Feb 2 2011 Orion Poplawski - 2.8.4-0.2.rc2 +- Update to 2.8.4 RC 2 + * Tue Jan 18 2011 Orion Poplawski - 2.8.4-0.1.rc1 - Update to 2.8.4 RC 1 - Drop qt4 patch diff --git a/sources b/sources index a222477..ec93679 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -594c207ca1a36034dedb7213da934dd9 cmake-2.8.4-rc1.tar.gz +2ba807197b92b71727b58b8e3d253a89 cmake-2.8.4-rc2.tar.gz From 28b2f0dbd188073d6192c57c967ff357866d9eef Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 17 Feb 2011 08:57:33 -0700 Subject: [PATCH 12/13] Update to 2.8.4 final --- .gitignore | 1 + cmake.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ee7a7a2..f22dd47 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ cmake-2.8.2.tar.gz /cmake-2.8.3.tar.gz /cmake-2.8.4-rc1.tar.gz /cmake-2.8.4-rc2.tar.gz +/cmake-2.8.4.tar.gz diff --git a/cmake.spec b/cmake.spec index 795a0f1..4c3c3d0 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver -rc2 +%define rcver %{nil} Name: cmake Version: 2.8.4 -Release: 0.2.rc2%{?dist} +Release: 1%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -154,6 +154,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Thu Feb 17 2011 Orion Poplawski - 2.8.4-1 +- Update to 2.8.4 final + * Wed Feb 2 2011 Orion Poplawski - 2.8.4-0.2.rc2 - Update to 2.8.4 RC 2 diff --git a/sources b/sources index ec93679..65e1bf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ba807197b92b71727b58b8e3d253a89 cmake-2.8.4-rc2.tar.gz +209b7d1d04b2e00986538d74ba764fcf cmake-2.8.4.tar.gz From bfbe8d889cf8be632f3434c09a2686ee5aa5279f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 24 Feb 2011 10:57:30 -0700 Subject: [PATCH 13/13] Fixup non-gui builds --- cmake.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 4c3c3d0..7ddc71f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -121,14 +121,15 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/rpm/macros.cmake %{_datadir}/doc/%{name}-%{version}/ +%if %{with gui} %exclude %{_datadir}/doc/%{name}-%{version}/cmake-gui.* +%endif %{_bindir}/ccmake %{_bindir}/cmake %{_bindir}/cpack %{_bindir}/ctest %{_datadir}/%{name}/ %{_mandir}/man1/ccmake.1.gz -%{_mandir}/man1/cmake-gui.1.gz %{_mandir}/man1/cmake.1.gz %{_mandir}/man1/cmakecommands.1.gz %{_mandir}/man1/cmakecompat.1.gz