[cmake] Update to 2.8.5 final Drop issue 12307 patch

[Orion Poplawski]

commit fb6f0e58a55c22dfe2fda5ae3cb4a6fd9fd0aceb
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Jul 22 16:42:10 2011 -0600

    Update to 2.8.5 final
    Drop issue 12307 patch

 .gitignore             |    1 +
 cmake-issue12307.patch |   82 ------------------------------------------------
 cmake.spec             |   11 +++---
 sources                |    2 +-
 4 files changed, 8 insertions(+), 88 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 649525c..5474951 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ cmake-2.8.2.tar.gz
 /cmake-2.8.5-rc1.tar.gz
 /cmake-2.8.5-rc2.tar.gz
 /cmake-2.8.5-rc3.tar.gz
+/cmake-2.8.5.tar.gz
diff --git a/cmake.spec b/cmake.spec
index c541cb2..36f2fcd 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 %{nil}
 
 Name:           cmake
 Version:        2.8.5
-Release:        0.3.rc3%{?dist}
+Release:        1%{?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
-# http://public.kitware.com/Bug/view.php?id=12307 - Fix swig regression
-Patch0:         cmake-issue12307.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 -b .issue12307
 
 
 %build
@@ -159,6 +156,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Fri Jul 22 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-1
+- Update to 2.8.5 final
+- Drop issue 12307 patch
+
 * Thu Jul 21 2011 Orion Poplawski <orion at cora.nwra.com> - 2.8.5-0.3.rc3
 - Update to 2.8.5 RC 3
 - Drop upstreamed swig patch
diff --git a/sources b/sources
index ae51d8f..7f281e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d8018f8fa4c499e2c5b288d71660cba  cmake-2.8.5-rc3.tar.gz
+3c5d32cec0f4c2dc45f4c2e84f4a20c5  cmake-2.8.5.tar.gz