rpms/koffice/devel .cvsignore, 1.42, 1.43 koffice.spec, 1.170, 1.171 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/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4765

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/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	25 May 2010 11:36:23 -0000	1.42
+++ .cvsignore	2 Jul 2010 20:47:44 -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/devel/koffice.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- koffice.spec	31 May 2010 15:58:31 -0000	1.170
+++ koffice.spec	2 Jul 2010 20:47:44 -0000	1.171
@@ -20,8 +20,8 @@
 
 Name:           koffice
 Epoch:          3 
-Version:        2.2.0
-Release:        2%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -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
@@ -1130,6 +1125,12 @@ 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)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	25 May 2010 11:36:25 -0000	1.42
+++ sources	2 Jul 2010 20:47:44 -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 ---