From 59adb8140fd1ec13b8885224a8ffdfdc5e8d1b02 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 29 Sep 2008 21:58:46 +0000 Subject: [PATCH] - Update to 2.6.2 --- .cvsignore | 2 +- cmake.spec | 20 +++++++++++++------- sources | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index dcdb5f8..96d6250 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cmake-2.4.8.tar.gz +cmake-2.6.2.tar.gz diff --git a/cmake.spec b/cmake.spec index de589d4..582011a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,20 +1,20 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture %bcond_with bootstrap +# Set to RC version if building RC, else %{nil} +%define rcver %{nil} Name: cmake -Version: 2.6.1 -Release: 3%{?dist} +Version: 2.6.2 +Release: 1%{?dist} Summary: Cross-platform make system Group: Development/Tools License: BSD URL: http://www.cmake.org -Source0: http://www.cmake.org/files/v2.6/cmake-%{version}.tar.gz +Source0: http://www.cmake.org/files/v2.6/cmake-%{version}%{rcver}.tar.gz Source2: macros.cmake BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#See http://public.kitware.com/Bug/view.php?id=7392 -Patch1: cmake-2.6.1-parens.patch BuildRequires: ncurses-devel, libX11-devel BuildRequires: qt4-devel, desktop-file-utils @@ -42,8 +42,7 @@ The %{name}-gui package contains the Qt based GUI for CMake. %prep -%setup -q -n %{name}-%{version} -%patch1 -p1 -b .parens +%setup -q -n %{name}-%{version}%{rcver} # Fixup permissions find -name \*.h -o -name \*.cxx -print0 | xargs -0 chmod -x @@ -114,6 +113,13 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog +* Mon Sep 29 2008 Orion Poplawski - 2.6.2-1 +- Update to 2.6.2 + +* Mon Sep 8 2008 Orion Poplawski - 2.6.2-0.rc3.1 +- Update to 2.6.2-RC-2 +- Drop parens patch fixed upstream + * Tue Sep 2 2008 Orion Poplawski - 2.6.1-3 - Drop jni patch, applied upstream. diff --git a/sources b/sources index 8694515..7d45bf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6717f4bc3cfcced4172ad98660ce7599 cmake-2.6.1.tar.gz +9e82aa3beb991aa8e5797cf330618d42 cmake-2.6.2.tar.gz