rpms/koffice/FC-4 .cvsignore, 1.7, 1.8 koffice.spec, 1.13, 1.14 sources, 1.7, 1.8

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30044/FC-4

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
- fix #191388
- add kexi forms patch
- version upgrade
- exclude x-raw.desktop again



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Apr 2006 22:05:51 -0000	1.7
+++ .cvsignore	30 May 2006 07:27:36 -0000	1.8
@@ -1 +1 @@
-koffice-1.5.0.tar.bz2
+koffice-1.5.1.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- koffice.spec	22 Apr 2006 07:41:24 -0000	1.13
+++ koffice.spec	30 May 2006 07:27:36 -0000	1.14
@@ -1,23 +1,22 @@
 Name:           koffice
-Version:        1.5.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-1.5.1.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-Patch1:         koffice-kexi-version.patch
+Patch1:         koffice-forms-plugins.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
 BuildRequires:  automake
 BuildRequires:  autoconf >= 2.53
-BuildRequires:  xorg-x11-devel
 BuildRequires:  kdebase-devel
 BuildRequires:  kdelibs-devel
 BuildRequires:  freetype-devel
@@ -56,6 +55,7 @@
 BuildRequires:  libxslt-devel
 BuildRequires:  OpenEXR-devel
 BuildRequires:  libexif-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  readline-devel
 BuildRequires:  ruby ruby-devel
 
@@ -226,8 +226,9 @@
 %prep
 %setup -q
 %patch0 -p1
+cd kexi
 %patch1
-
+cd ..
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
 
@@ -478,6 +479,8 @@
 %{_libdir}/libkformulalib.so.*
 %{_libdir}/libkopalette.so.*
 %{_libdir}/libkoproperty.so.*
+%{_libdir}/libkrossapi.so.*
+%{_libdir}/libkrossmain.so.*
 %{_libdir}/kde3/kfile_koffice.*
 %{_libdir}/kde3/kfile_ooo.*
 %{_libdir}/kde3/kfile_abiword.*
@@ -526,6 +529,7 @@
 %{_datadir}/apps/kross
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
+%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*
@@ -703,7 +707,6 @@
 %{_libdir}/kde3/libkritapngimport.*
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
-%{_libdir}/kde3/kritaperftest.*
 %{_libdir}/kde3/krosskritacore.*
 %{_datadir}/apps/krita
 %{_datadir}/services/krita*.desktop
@@ -768,8 +771,6 @@
 %{_libdir}/kde3/kexihandler_csv_importexport.*
 %{_libdir}/kde3/krosskexiapp.*
 %{_libdir}/kde3/krosskexidb.*
-%{_libdir}/libkrossapi.so.*
-%{_libdir}/libkrossmain.so.*
 %{_datadir}/config/kexirc
 %{_datadir}/config/magic/kexi.magic
 %{_datadir}/mimelnk/application/*
@@ -910,6 +911,13 @@
 %{_datadir}/applications/fedora-kplato.desktop
 
 %changelog
+* Sun May 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.1-1
+- fix #191388
+- add kexi forms patch
+- version upgrade
+- exclude x-raw.desktop again
+
 * Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.0-1
 - split out kexi-drivers  (#188746) and fix some related issues


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Apr 2006 22:05:51 -0000	1.7
+++ sources	30 May 2006 07:27:36 -0000	1.8
@@ -1 +1 @@
-220b6bde28b5ebd5c6621bc87ca2c05f  koffice-1.5.0.tar.bz2
+50897bd5dfd4eba8a0d78a02003a6ec9  koffice-1.5.1.tar.bz2