[cmake/f17: 11/11] Merge remote-tracking branch 'origin/master' into f17

[Lukas Tinkl]

commit 2b4f452d761b23da6fb849341bf7b75f802e4506
Merge: 01437f4 4333cee
Author: Lukas Tinkl <lukas at kde.org>
Date:   Fri Apr 20 20:21:27 2012 +0200

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	cmake.spec

 .gitignore            |    3 ++
 cmake-pkgconfig.patch |   55 +++++++++++++++++++++++++++++++++++++++++++++++++
 cmake.spec            |   41 ++++++++++++++++++++++++++++--------
 macros.cmake          |    1 -
 sources               |    2 +-
 5 files changed, 91 insertions(+), 11 deletions(-)
---
diff --cc cmake.spec
index c0c351b,29fa2c6..6a446d9
--- a/cmake.spec
+++ b/cmake.spec
@@@ -160,8 -165,26 +165,26 @@@ update-mime-database %{_datadir}/mime &
  
  
  %changelog
- * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.7-5
- - Rebuilt for c++ ABI breakage
 -* 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
+ - adjust pkgconfig patch (#812188)
+ 
+ * Fri Apr 13 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.8-0.3.rc2
+ - Add upstream patch to set PKG_CONFIG_FOUND (bug #812188)
+ 
+ * Mon Apr 9 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.8-0.2.rc2
+ - Update to 2.8.8 RC 2
+ 
+ * Fri Mar 23 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.8-0.1.rc1
+ - Update to 2.8.8 RC 1
+ 
+ * Tue Feb 21 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.7-6
+ - Just strip CMAKE_INSTALL_LIBDIR from %%cmake macro
+ 
+ * Tue Feb 21 2012 Orion Poplawski <orion at cora.nwra.com> - 2.8.7-5
+ - Strip CMAKE_INSTALL_LIBDIR and others from %%cmake macro (bug 795542)
  
  * Thu Jan 26 2012 Tomas Bzatek <tbzatek at redhat.com> - 2.8.7-4
  - Rebuilt for new libarchive