[kdevplatform/f14/master: 9/9] Merge commit 'origin/f15/master~1' into f14/master

[Rex Dieter]

commit 8133ce877719161a2bdedce0243839461fed91fe
Merge: 047cd78 180df75
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 17 11:02:52 2011 -0500

    Merge commit 'origin/f15/master~1' into f14/master
    
    Conflicts:
    	.gitignore
    	kdevplatform.spec
    	sources

 .gitignore                     |    3 +--
 kdevplatform-1.2.0-gcc46.patch |   24 ++++++++++++++++++++++++
 kdevplatform.spec              |   40 ++++++++++++++++++++++++----------------
 sources                        |    2 +-
 4 files changed, 50 insertions(+), 19 deletions(-)
---
diff --cc kdevplatform.spec
index 9016cd4,bec687f..bce7844
--- a/kdevplatform.spec
+++ b/kdevplatform.spec
@@@ -1,7 -1,8 +1,8 @@@
+ 
  Name:           kdevplatform
  Summary:        Libraries for use by KDE development tools
- Version:        1.1.2
- Release:        1%{?dist}
+ Version:        1.2.0
 -Release:        2%{?dist}
++Release:        3%{?dist}
  
  Group:          Development/Tools
  License:        GPLv2
@@@ -119,8 -112,20 +112,23 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
- * Tue Jan 18 2011 Radek Novacek <rnovacek at redhat.com> - 1.1.2-1
- - kdevplatform-4.1.2
++* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
++- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
++
+ * Sat Jan 29 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.2.0-2
+ - fix FTBFS with g++ 4.6
+ 
+ * Tue Jan 25 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-1
+ - 1.2.0
+ 
+ * Fri Jan 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.90-1
+ - Update to 1.1.90 (1.2 RC1)
+ 
+ * Tue Dec 28 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.81-1
+ - Update to 1.1.81 (1.2 Beta 2)
+ 
+ * Thu Dec 16 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.1.80-1
+ - Update to 1.1.80 (1.2 Beta 1, required for kdelibs 4.6, #660740)
  
  * Mon Dec 06 2010 Rex Dieter <rdieter at fedoraproject.org> -  1.1.1-1
  - Update to 1.1.1