[cmake/f17: 5/5] Merge from master

[Orion Poplawski]

commit 32385641587d8a5daab4c4a59b5eacdf63c6579b
Merge: 2b4f452 0cf5901
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue May 22 09:52:54 2012 -0600

    Merge from master

 cmake-findruby.patch |   20 ++++++++++++++++
 cmake.spec           |   61 ++++++++++++++++++++++++++++++++-----------------
 2 files changed, 60 insertions(+), 21 deletions(-)
---
diff --cc cmake.spec
index 6a446d9,0963b3a..1bb160f
--- a/cmake.spec
+++ b/cmake.spec
@@@ -165,7 -175,16 +175,16 @@@ update-mime-database %{_datadir}/mime &
  
  
  %changelog
+ * Mon May 21 2012 Orion Poplawski <orion at cora.nwra.com> 2.8.8-4
+ - Add patch to fix FindRuby (bug 822796)
+ 
+ * Thu May 10 2012 Rex Dieter <rdieter at fedoraproject.org> 2.8.8-3
+ - Incorrect license tag in spec file (#820334)
+ 
+ * Thu May 3 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.8-2
+ - Comply with Emacs packaging guidlines (bug #818658)
+ 
 -* Thu Apr 19 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.8-1
 +* Thu Apr 20 2012 Lukas Tinkl <ltinkl at redhat.com> - 2.8.8-1
  - Update to 2.8.8 final
  
  * Sat Apr 14 2012 Rex Dieter <rdieter at fedoraproject.org> 2.8.8-0.4.rc2