[koffice: 5/5] Merge branch 'f14' for %%description/%%sumary updates

[Rex Dieter]

commit d57d951305bbb3a08dddaf2ead33cf7416f441e9
Merge: 6ec2784 128271a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 8 11:57:08 2010 -0500

    Merge branch 'f14' for %%description/%%sumary updates
    
    Conflicts:
    	koffice.spec

 koffice.spec |   74 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 53 insertions(+), 21 deletions(-)
---
diff --cc koffice.spec
index e6a14d1,13141ca..e18862f
--- a/koffice.spec
+++ b/koffice.spec
@@@ -21,7 -21,7 +21,7 @@@
  Name:           koffice
  Epoch:          3 
  Version:        2.2.2
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        An integrated office suite
  
  Group:          Applications/Productivity
@@@ -1133,9 -1155,9 +1162,12 @@@ f
  
  
  %changelog
- * Wed Sep 08 2010 Rex Dieter <rdieter at fedoraproject.org. - 3:2.2.2-2
++* Wed Sep 08 2010 Rex Dieter <rdieter at fedoraproject.org. - 3:2.2.2-3
 +- include some kexi patches recommended by upstream
 +
+ * Mon Aug 30 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.2-2
+ - update %%description/%%summary all over
+ 
  * Sat Aug 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.2-1
  - koffice-2.2.2