rpms/koffice/F-13 .cvsignore, 1.41, 1.42 koffice.spec, 1.152, 1.153 sources, 1.41, 1.42

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12000

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* Mon May 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.0-1
- koffice-2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	26 Apr 2010 16:40:01 -0000	1.41
+++ .cvsignore	25 May 2010 13:28:03 -0000	1.42
@@ -1 +1 @@
-koffice-2.1.91.tar.bz2
+koffice-2.2.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/koffice.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- koffice.spec	18 May 2010 21:58:21 -0000	1.152
+++ koffice.spec	25 May 2010 13:28:03 -0000	1.153
@@ -20,23 +20,21 @@
 
 Name:           koffice
 Epoch:          3 
-Version:        2.1.91
-Release:        6%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
 # apps GPLv2+, libs LGPLv2+
 License:        GPLv2+
 URL:            http://www.koffice.org/
-Source0:        http://download.kde.org/unstable/koffice-%{version}/koffice-%{version}.tar.bz2
+Source0:        http://download.kde.org/stable/koffice-%{version}/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
 
 ## upstream patches
-# don't crash on exit in at least KWord (kde#235345)
-# based on http://websvn.kde.org/trunk/koffice/libs/flake/KoToolBase_p.h?r1=1125860&r2=1125859&pathrev=1125860&view=patch
-Patch100: koffice-2.1.91-kde#235345.patch
+Patch100: koffice-2.2.0-kspread_kutils.patch
 
 #-- The following OPTIONAL packages could NOT be located on your system.
 #-- Consider installing them to enable more features from this software.
@@ -455,7 +453,8 @@ Requires:       libxml2-devel
 
 %prep
 %setup -q
-%patch100 -p1 -b .kde#235345
+
+%patch100 -p1 -b .kspread_kutils
 
 ## kdchart munging begin
 pushd kchart/kdchart
@@ -994,7 +993,7 @@ fi
 %if 0%{?kformula}
 %files kformula
 %defattr(-,root,root,-)
-%{_kde4_bindir}/kformula
+#{_kde4_bindir}/kformula
 %{_kde4_libdir}/libkdeinit_kformula.so
 %{_kde4_libdir}/kde4/*kformula*.*
 %{_kde4_libdir}/kde4/formulashape.*
@@ -1131,6 +1130,9 @@ fi
 
 
 %changelog
+* Mon May 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.0-1
+- koffice-2.2.0
+
 * Wed May 12 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:2.1.91-6
 - don't obsolete koffice-kivio
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	26 Apr 2010 16:40:01 -0000	1.41
+++ sources	25 May 2010 13:28:04 -0000	1.42
@@ -1 +1 @@
-9f91571e320bf01e1aa1face0a5155b8  koffice-2.1.91.tar.bz2
+204afae16ff90148a61752bccd86b278  koffice-2.2.0.tar.bz2