rpms/koffice/F-13 .cvsignore, 1.42, 1.43 koffice.spec, 1.153, 1.154 sources, 1.42, 1.43 koffice-2.2.0-kspread_kutils.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore koffice.spec sources 
Removed Files:
	koffice-2.2.0-kspread_kutils.patch 
Log Message:
* Fri Jul 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.1-1
- koffice-2.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	25 May 2010 13:28:03 -0000	1.42
+++ .cvsignore	3 Jul 2010 15:43:42 -0000	1.43
@@ -1 +1 @@
-koffice-2.2.0.tar.bz2
+koffice-2.2.1.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/koffice.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- koffice.spec	25 May 2010 13:28:03 -0000	1.153
+++ koffice.spec	3 Jul 2010 15:43:42 -0000	1.154
@@ -20,7 +20,7 @@
 
 Name:           koffice
 Epoch:          3 
-Version:        2.2.0
+Version:        2.2.1
 Release:        1%{?dist}
 Summary:        An integrated office suite
 
@@ -34,7 +34,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 ## upstreamable patches
 
 ## upstream patches
-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.
@@ -42,9 +41,6 @@ Patch100: koffice-2.2.0-kspread_kutils.p
 #   * Create Resources  <http://create.freedesktop.org>
 #     Create Resources (brushes, palettes etc.)
 #     Required by KOffice for optional extra resources.
-#   * XBase  <http://linux.techass.com/projects/xdb/>
-#     XBase compatible C++ class library
-#     Required by Kexi XBase Migration driver
 #   * LibRCPS (0.2 or higher)  <http://www.librcps.org>
 #     Resource Conflict Project Scheduling Library
 #     Required by KPlato RCPS Plugin
@@ -104,6 +100,7 @@ BuildRequires: qca2-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: readline-devel
 BuildRequires: sqlite-devel
+BuildRequires: xbase-devel
 
 %description
 KOffice is an integrated office suite.
@@ -454,8 +451,6 @@ Requires:       libxml2-devel
 %prep
 %setup -q
 
-%patch100 -p1 -b .kspread_kutils
-
 ## kdchart munging begin
 pushd kchart/kdchart
 mv src kdchart
@@ -763,6 +758,7 @@ fi
 %{_datadir}/dbus-1/services/com.nokia.FreOffice.service
 %endif
 
+
 %files libs
 %defattr(-,root,root,-)
 %{_kde4_datadir}/kde4/servicetypes/flake*.desktop
@@ -994,12 +990,12 @@ fi
 %files kformula
 %defattr(-,root,root,-)
 #{_kde4_bindir}/kformula
-%{_kde4_libdir}/libkdeinit_kformula.so
+#{_kde4_libdir}/libkdeinit_kformula.so
 %{_kde4_libdir}/kde4/*kformula*.*
 %{_kde4_libdir}/kde4/formulashape.*
 %{_kde4_appsdir}/kformula/
 %{_kde4_datadir}/kde4/services/kformula*.desktop
-%{_kde4_datadir}/applications/kde4/*kformula.desktop
+#{_kde4_datadir}/applications/kde4/*kformula.desktop
 %{_kde4_docdir}/HTML/en/kformula/
 %{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
 
@@ -1130,6 +1126,15 @@ fi
 
 
 %changelog
+* Fri Jul 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.1-1
+- koffice-2.2.1
+
+* Tue Jun 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.0-3
+- BR: xbase-devel
+
+* Mon May 31 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.0-2 
+- rebuild (exiv2)
+
 * Mon May 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.2.0-1
 - koffice-2.2.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	25 May 2010 13:28:04 -0000	1.42
+++ sources	3 Jul 2010 15:43:42 -0000	1.43
@@ -1 +1 @@
-204afae16ff90148a61752bccd86b278  koffice-2.2.0.tar.bz2
+356ee16bcf4ec3ff321ebe43cc1e1f29  koffice-2.2.1.tar.bz2


--- koffice-2.2.0-kspread_kutils.patch DELETED ---