rpms/koffice/FC-4 .cvsignore, 1.6, 1.7 koffice.spec, 1.11, 1.12 sources, 1.6, 1.7 koffice-CAN-2005-3193.diff, 1.1, NONE koffice-krita-kisfilter.patch, 1.1, NONE

Andreas Bierfert (awjb) fedora-extras-commits at redhat.com
Sun Apr 16 22:05:51 UTC 2006 

Author: awjb

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

Modified Files:
	.cvsignore koffice.spec sources 
Removed Files:
	koffice-CAN-2005-3193.diff koffice-krita-kisfilter.patch 
Log Message:
- version upgrade
- merge fc5 -> fc4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Oct 2005 23:11:32 -0000	1.6
+++ .cvsignore	16 Apr 2006 22:05:51 -0000	1.7
@@ -1 +1 @@
-koffice-1.4.2.tar.bz2
+koffice-1.5.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- koffice.spec	13 Dec 2005 09:55:00 -0000	1.11
+++ koffice.spec	16 Apr 2006 22:05:51 -0000	1.12
@@ -1,20 +1,17 @@
 Name:           koffice
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-1.4.2.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-# CAN-2005-3193 see #175260
-Patch1:         koffice-CAN-2005-3193.diff
-
-Patch100:       koffice-krita-kisfilter.patch
+Patch1:         koffice-kexi-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -55,6 +52,12 @@
 BuildRequires:  doxygen
 BuildRequires:  graphviz-devel
 BuildRequires:  aspell-devel
+BuildRequires:  libacl-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  OpenEXR-devel
+BuildRequires:  libexif-devel
+BuildRequires:  readline-devel
+BuildRequires:  ruby ruby-devel
 
 %description
 KOffice - Integrated Office Suite
@@ -74,9 +77,12 @@
 Requires:       koffice-krita
 Requires:       koffice-kugar
 Requires:       koffice-kexi
+Requires:       koffice-kexi-driver-mysql
+Requires:       koffice-kexi-driver-pgsql
 Requires:       koffice-kchart
 Requires:       koffice-kformula
 Requires:       koffice-filters
+Requires:       koffice-kplato
 
 %description suite
 KOffice - Integrated Office Suite
@@ -129,6 +135,7 @@
 Summary:        A flowcharting application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{version}-%{release}
+Requires:       kdegraphics
 Obsoletes:      kivio
 
 %description kivio
@@ -165,6 +172,23 @@
 
 %description kexi
 %{summary}
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%package kexi-driver-mysql
+Summary:        mysql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-mysql
+%{summary}
+
+%package kexi-driver-pgsql
+Summary:        pgsql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-pgsql
+%{summary}
 
 %package kchart
 Summary:        An integrated graph and chart drawing tool
@@ -191,11 +215,18 @@
 %description filters
 %{summary}
 
+%package kplato
+Summary:         An integrated project management and planning tool
+Group:           Applications/Productivity
+Requires:        %{name}-core = %{version}-%{release}
+
+%description kplato
+%{summary}
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1
-%patch100
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -207,7 +238,8 @@
 --enable-fast-install --with-pic --disable-static \
 --with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
 --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
---with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir}
+--with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+--enable-final
 
 make
 
@@ -247,14 +279,6 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop
 
-# kformdesigner
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kformdesigner.desktop
-
 #kword
 desktop-file-install \
   --vendor=fedora \
@@ -300,22 +324,50 @@
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=X-Fedora \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_jpeg.desktop
 
-#kugar
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=X-Fedora \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_openexr.desktop
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_png.desktop
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_raw.desktop
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_tiff.desktop
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop
 
+#kugar
 desktop-file-install \
   --vendor=fedora \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=X-Fedora \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kudesigner.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
 
 #kchart
 desktop-file-install \
@@ -347,7 +399,17 @@
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=X-Fedora \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kexi.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kexi.desktop
+
+#kplato
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kplato.desktop
+
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -388,33 +450,38 @@
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
 
+%post kplato -p /sbin/ldconfig
+%postun kplato -p /sbin/ldconfig
+
 %files suite
 #empty => virtual package
 
 %files core
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB README
-%{_bindir}/koscript
 %{_bindir}/koshell
 %{_bindir}/kthesaurus
 %{_bindir}/koconverter
-%{_libdir}/libkdeinit_koshell.*
-%{_libdir}/libkdeinit_kthesaurus.*
-%{_libdir}/libkdchart.*
-%{_libdir}/libkochart.*
-%{_libdir}/libkofficecore.*
-%{_libdir}/libkofficeui.*
-%{_libdir}/libkoscript.*
-%{_libdir}/libkotext.*
-%{_libdir}/libkowmf.*
-%{_libdir}/libkopainter.*
-%{_libdir}/libkstore.*
-%{_libdir}/libkwmailmerge_interface.*
-%{_libdir}/libkwmf.*
-%{_libdir}/libkdeinit_kformula.*
-%{_libdir}/libkformulalib.*
+%{_libdir}/libkdeinit_koshell.so
+%{_libdir}/libkdeinit_kthesaurus.so
+%{_libdir}/libkdchart.so.*
+%{_libdir}/libkochart.so.*
+%{_libdir}/libkofficecore.so.*
+%{_libdir}/libkofficeui.so.*
+%{_libdir}/libkotext.so.*
+%{_libdir}/libkowmf.so.*
+%{_libdir}/libkopainter.so.*
+%{_libdir}/libkstore.so.*
+%{_libdir}/libkwmailmerge_interface.so.*
+%{_libdir}/libkwmf.so.*
+%{_libdir}/libkdeinit_kformula.so
+%{_libdir}/libkformulalib.so.*
+%{_libdir}/libkopalette.so.*
+%{_libdir}/libkoproperty.so.*
 %{_libdir}/kde3/kfile_koffice.*
 %{_libdir}/kde3/kfile_ooo.*
+%{_libdir}/kde3/kfile_abiword.*
+%{_libdir}/kde3/kfile_gnumeric.*
 %{_libdir}/kde3/kodocinfopropspage.*
 %{_libdir}/kde3/kofficescan.*
 %{_libdir}/kde3/kofficethumbnail.*
@@ -452,15 +519,26 @@
 %{_datadir}/servicetypes/widgetfactory.desktop
 %{_datadir}/applications/fedora-KThesaurus.desktop
 %{_datadir}/applications/fedora-koshell.desktop
+%{_datadir}/apps/kofficewidgets/pics/kounitdoublecombobox.png
+%{_datadir}/apps/kofficewidgets/pics/kounitdoublelineedit.png
+%{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
+%{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
+%{_datadir}/apps/kross
+%{_libdir}/kde3/krosspython.*
+%{_libdir}/kde3/krossruby.*
+# why is this still here on fc5 and not on devel?
+%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*
 %{_datadir}/doc/HTML/en/koffice-apidocs
+%{_libdir}/*.so
 
 %files kword
 %defattr(-,root,root,-)
 %{_bindir}/kword
-%{_libdir}/libkdeinit_kword.*
+%{_libdir}/libkdeinit_kword.so
+%{_libdir}/libkwordprivate.so.*
 %{_libdir}/kde3/libkwordpart.*
 %{_libdir}/kde3/kword.*
 %{_datadir}/apps/kword
@@ -474,8 +552,8 @@
 %files kspread
 %defattr(-,root,root,-)
 %{_bindir}/kspread
-%{_libdir}/libkdeinit_kspread.*
-%{_libdir}/libkspreadcommon.*
+%{_libdir}/libkdeinit_kspread.so
+%{_libdir}/libkspreadcommon.so.*
 %{_libdir}/kde3/kspread.*
 %{_libdir}/kde3/libkspreadpart.*
 %{_libdir}/kde3/kwmailmerge_kspread.*
@@ -499,10 +577,19 @@
 %defattr(-,root,root,-)
 %{_bindir}/kpresenter
 %{_bindir}/kprconverter.pl
-%{_libdir}/libkdeinit_kpresenter.*
+%{_libdir}/libkdeinit_kpresenter.so
+%{_libdir}/libkpresenterimageexport.so.*
+%{_libdir}/libkpresenterprivate.so.*
 %{_libdir}/kde3/libkpresenterpart.*
 %{_libdir}/kde3/kformula.*
 %{_libdir}/kde3/kpresenter.*
+%{_libdir}/kde3/libkpresenterbmpexport.*
+%{_libdir}/kde3/libkpresenterjpegexport.*
+%{_libdir}/kde3/libkpresentermngexport.*
+%{_libdir}/kde3/libkpresenterpngexport.*
+%{_libdir}/kde3/libkpresentersvgexport.*
+%{_libdir}/kde3/libkpresenterxbmexport.*
+%{_libdir}/kde3/libkpresenterxpmexport.*
 %{_datadir}/apps/kpresenter
 %{_datadir}/doc/HTML/en/kpresenter
 %{_datadir}/services/kpresenter*.desktop
@@ -513,9 +600,9 @@
 %files karbon
 %defattr(-,root,root,-)
 %{_bindir}/karbon
-%{_libdir}/libkdeinit_karbon.*
-%{_libdir}/libkarbonbase.*
-%{_libdir}/libkarboncommon.*
+%{_libdir}/libkdeinit_karbon.so
+%{_libdir}/libkarboncommon.so.*
+%{_libdir}/kde3/karbon_defaulttools.*
 %{_libdir}/kde3/karbon_flattenpathplugin.*
 %{_libdir}/kde3/karbon_imagetoolplugin.*
 %{_libdir}/kde3/karbon_insertknotsplugin.*
@@ -540,12 +627,25 @@
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.karbon
 %{_datadir}/applications/fedora-karbon.desktop
+%{_datadir}/doc/HTML/en/karbon/
 
 %files krita
 %defattr(-,root,root,-)
 %{_bindir}/krita
-%{_libdir}/libkdeinit_krita.*
-%{_libdir}/libkritacommon.*
+%{_libdir}/libkdeinit_krita.so
+%{_libdir}/libkrita_cmyk_u16.so.*
+%{_libdir}/libkrita_gray_u16.so.*
+%{_libdir}/libkrita_lms_f32.so.*
+%{_libdir}/libkrita_rgb_f16half.so.*
+%{_libdir}/libkrita_rgb_f32.so.*
+%{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkritacolor.so.*
+%{_libdir}/libkritagrayscale.so.*
+%{_libdir}/libkritaimage.so.*
+%{_libdir}/libkritargb.so.*
+%{_libdir}/libkritascripting.so.*
+%{_libdir}/libkritaui.so.*
+%{_libdir}/libkritacommon.so.*
 %{_libdir}/kde3/kritacimg.*
 %{_libdir}/kde3/kritacolorrange.*
 %{_libdir}/kde3/kritacolorsfilters.*
@@ -575,20 +675,54 @@
 %{_libdir}/kde3/libkritapart.*
 %{_libdir}/kde3/libkritamagickexport.*
 %{_libdir}/kde3/libkritamagickimport.*
+%{_libdir}/kde3/krita_cmyk_u16_plugin.*
+%{_libdir}/kde3/krita_gray_u16_plugin.*
+%{_libdir}/kde3/krita_lms_f32_plugin.*
+%{_libdir}/kde3/krita_rgb_f16half_plugin.*
+%{_libdir}/kde3/krita_rgb_f32_plugin.*
+%{_libdir}/kde3/krita_rgb_u16_plugin.*
+%{_libdir}/kde3/kritabumpmap.*
+%{_libdir}/kde3/kritacmykplugin.*
+%{_libdir}/kde3/kritadropshadow.*
+%{_libdir}/kde3/kritafiltersgallery.*
+%{_libdir}/kde3/kritahistogramdocker.*
+%{_libdir}/kde3/kritaimageenhancement.*
+%{_libdir}/kde3/kritapixelizefilter.*
+%{_libdir}/kde3/kritaroundcornersfilter.*
+%{_libdir}/kde3/kritascripting.*
+%{_libdir}/kde3/kritaseparatechannels.*
+%{_libdir}/kde3/kritasmalltilesfilter.*
+%{_libdir}/kde3/kritasmearybrush.*
+%{_libdir}/kde3/kritasobelfilter.*
+%{_libdir}/kde3/kritatoolselectsimilar.*
+%{_libdir}/kde3/kritawetplugin.*
+%{_libdir}/kde3/libkrita_openexr_export.*
+%{_libdir}/kde3/libkrita_openexr_import.*
+%{_libdir}/kde3/libkrita_raw_import.*
+%{_libdir}/kde3/libkritajpegexport.*
+%{_libdir}/kde3/libkritajpegimport.*
+%{_libdir}/kde3/libkritapngexport.*
+%{_libdir}/kde3/libkritapngimport.*
+%{_libdir}/kde3/libkritatiffexport.*
+%{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/kritaperftest.*
+%{_libdir}/kde3/krosskritacore.*
 %{_datadir}/apps/krita
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/fedora-krita.desktop
-%{_datadir}/applications/fedora-krita_magick.desktop
+%{_datadir}/applications/fedora-krita*.desktop
+%{_datadir}/apps/kritaplugins
+%{_datadir}/doc/HTML/en/krita
+%{_datadir}/servicetypes/karbon_module.desktop
 
 %files kugar
 %defattr(-,root,root,-)
 %{_bindir}/kugar
 %{_bindir}/kudesigner
-%{_libdir}/libkdeinit_kugar.*
-%{_libdir}/libkdeinit_kudesigner.*
-%{_libdir}/libkugarlib.*
-%{_libdir}/libkudesignercore.*
+%{_libdir}/libkdeinit_kugar.so
+%{_libdir}/libkdeinit_kudesigner.so
+%{_libdir}/libkugarlib.so.*
+%{_libdir}/libkudesignercore.so
 %{_libdir}/kde3/kudesigner.*
 %{_libdir}/kde3/kugar.*
 %{_libdir}/kde3/libkudesignerpart.*
@@ -598,71 +732,86 @@
 %{_datadir}/doc/HTML/en/kugar
 %{_datadir}/services/kugar*.desktop
 %{_datadir}/applications/fedora-kugar.desktop
-%{_datadir}/applications/fedora-kudesigner.desktop
+# this not being fedorarized fixes #173086
+%{_datadir}/applnk/Office/kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
 %{_bindir}/kexi
-%{_bindir}/keximigratetest
-%{_bindir}/kformdesigner
 %{_bindir}/ksqlite*
-%{_libdir}/libkdeinit_kexi.*
-%{_libdir}/libkexicore.*
-%{_libdir}/libkexidatatable.*
-%{_libdir}/libkexidbparser.*
-%{_libdir}/libkexidb.*
-%{_libdir}/libkexiextendedwidgets.*
-%{_libdir}/libkexiformutils.*
-%{_libdir}/libkexiguiutils.*
-%{_libdir}/libkeximain.*
-%{_libdir}/libkeximigrate.*
-%{_libdir}/libkexipropertyeditor.*
-%{_libdir}/libkexirelationsview.*
-%{_libdir}/libkexisql2.*
-%{_libdir}/libkexisql3.*
-%{_libdir}/libkformdesigner.*
-%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_bindir}/krossrunner
+%{_libdir}/libkdeinit_kexi.so
+%{_libdir}/libkexicore.so.*
+%{_libdir}/libkexidatatable.so.*
+%{_libdir}/libkexidbparser.so.*
+%{_libdir}/libkexidb.so.*
+%{_libdir}/libkexiextendedwidgets.so.*
+%{_libdir}/libkexiformutils.so.*
+%{_libdir}/libkexiguiutils.so.*
+%{_libdir}/libkeximain.so.*
+%{_libdir}/libkeximigrate.so.*
+%{_libdir}/libkexirelationsview.so.*
+%{_libdir}/libkexisql2.so.*
+%{_libdir}/libkexisql3.so.*
+%{_libdir}/libkformdesigner.so.*
+%{_libdir}/libkexiutils.so.*
+%{_libdir}/kde3/kformdesigner_containers.*
+%{_libdir}/kde3/kformdesigner_kexidbwidgets.*
+%{_libdir}/kde3/kformdesigner_stdwidgets.*
 %{_libdir}/kde3/kexidb_sqlite2driver.*
 %{_libdir}/kde3/kexidb_sqlite3driver.*
-%{_libdir}/kde3/kexidbwidgets.*
 %{_libdir}/kde3/kexihandler_form.*
 %{_libdir}/kde3/kexihandler_migration.*
 %{_libdir}/kde3/kexihandler_query.*
 %{_libdir}/kde3/kexihandler_relation.*
 %{_libdir}/kde3/kexihandler_script.*
 %{_libdir}/kde3/kexihandler_table.*
-%{_libdir}/kde3/keximigrate_mysql.*
 %{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/libkformdesigner_part.*
-%{_libdir}/kde3/kexidb_pqxxsqldriver.*
-%{_libdir}/kde3/keximigrate_pqxx.*
-%{_libdir}/kde3/containers.*
-%{_libdir}/kde3/stdwidgets.*
+%{_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/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/services/kexidb*
-%{_datadir}/services/keximigrate_mysql.desktop
-%{_datadir}/services/keximigrate_pqxx.desktop
 %{_datadir}/apps/kexi
-%{_datadir}/apps/kformdesigner
-%{_datadir}/apps/kformdesigner_part
 %{_datadir}/services/kformdesigner/*
-%{_datadir}/services/kformdesigner_part.desktop
-%{_datadir}/applications/fedora-kformdesigner.desktop
+%{_datadir}/doc/HTML/en/kexi
 %{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
+
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
 %files kchart
 %defattr(-,root,root,-)
 %{_bindir}/kchart
-%{_libdir}/libkchartcommon.*
-%{_libdir}/libkdeinit_kchart.*
+%{_libdir}/libkchartcommon.so.*
+%{_libdir}/libkdeinit_kchart.so
+%{_libdir}/libkchartimageexport.so.*
 %{_libdir}/kde3/kchart.*
 %{_libdir}/kde3/libkchartpart.*
 %{_libdir}/kde3/libkchartpngexport.*
 %{_libdir}/kde3/libkchartsvgexport.*
+%{_libdir}/kde3/libkchartbmpexport.*
+%{_libdir}/kde3/libkchartjpegexport.*
+%{_libdir}/kde3/libkchartmngexport.*
+%{_libdir}/kde3/libkchartxbmexport.*
+%{_libdir}/kde3/libkchartxpmexport.*
 %{_datadir}/apps/kchart
 %{_datadir}/services/kchart*.desktop
 %{_datadir}/doc/HTML/en/kchart
@@ -681,16 +830,17 @@
 %files kivio
 %defattr(-,root,root,-)
 %{_bindir}/kivio
-%{_libdir}/libkdeinit_kivio.*
-%{_libdir}/libkiviocommon.*
-%{_libdir}/libkivioconnectortool.*
-%{_libdir}/libkivioselecttool.*
-%{_libdir}/libkiviotargettool.*
-%{_libdir}/libkiviotexttool.*
-%{_libdir}/libkiviozoomtool.*
+%{_libdir}/libkdeinit_kivio.so
+%{_libdir}/libkiviocommon.so.*
 %{_libdir}/kde3/kivio.*
 %{_libdir}/kde3/libkiviopart.*
 %{_libdir}/kde3/straight_connector.*
+%{_libdir}/kde3/libkivioconnectortool.*
+%{_libdir}/kde3/libkivioimageexport.*
+%{_libdir}/kde3/libkivioselecttool.*
+%{_libdir}/kde3/libkiviotargettool.*
+%{_libdir}/kde3/libkiviotexttool.*
+%{_libdir}/kde3/libkiviozoomtool.*
 %{_datadir}/apps/kivio
 %{_datadir}/config.kcfg/kivio.kcfg
 %{_datadir}/doc/HTML/en/kivio
@@ -699,7 +849,7 @@
 
 %files filters
 %defattr(-,root,root,-)
-%{_libdir}/libkwordexportfilters.*
+%{_libdir}/libkwordexportfilters.so.*
 %{_libdir}/kde3/libabiwordexport.*
 %{_libdir}/kde3/libabiwordimport.*
 %{_libdir}/kde3/libamiproexport.*
@@ -725,7 +875,6 @@
 %{_libdir}/kde3/libkwordlatexexport.*
 %{_libdir}/kde3/libmswriteexport.*
 %{_libdir}/kde3/libmswriteimport.*
-%{_libdir}/kde3/libolefilter.*
 %{_libdir}/kde3/libooimpressexport.*
 %{_libdir}/kde3/libooimpressimport.*
 %{_libdir}/kde3/liboowriterexport.*
@@ -742,25 +891,84 @@
 %{_libdir}/kde3/libmswordimport.*
 %{_libdir}/kde3/libxsltimport.*
 %{_libdir}/kde3/libxsltexport.*
+%{_libdir}/kde3/libhancomwordimport.*
+%{_libdir}/kde3/libkfosvgexport.*
+%{_libdir}/kde3/liboodrawimport.*
+%{_libdir}/kde3/libpowerpointimport.*
 %{_datadir}/apps/xsltfilter
 %{_datadir}/services/generic_filter.desktop
-%{_datadir}/services/ole*.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
 
+%files kplato
+%defattr(-,root,root,-)
+%{_bindir}/kplato
+%{_libdir}/libkdeinit_kplato.so
+%{_libdir}/kde3/kplato.*
+%{_libdir}/kde3/libkplatopart.*
+%{_datadir}/apps/kplato
+%{_datadir}/doc/HTML/en/kplato
+%{_datadir}/services/kplatopart.desktop
+%{_datadir}/applications/fedora-kplato.desktop
+
 %changelog
+* 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
+- fix #173086
+- upgrade to final
+
+* Thu Mar 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-0.1.rc1
+- version upgrade
+
+* Mon Mar 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.95-1
+- version upgrade
+
+* Sun Feb 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-4
+- kivio requires kdegraphics (#182289)
+
+* Wed Feb 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-3
+- exclude mimelnk/image/x-raw.desktop (#180335)
+
+* Mon Feb 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-2
+- enable ruby again (bug #179835)
+
+* Wed Feb 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-1
+- version upgrade
+- better split libdir/*.so -> -devel, libdir/*.so.* -> packages
+  libdir/*.la -> trash; libdir/.* -> packages
+
 * Thu Dec 08 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.4.2-2
+1.4.2-3
 - fix CAN-2005-3193
-- add compile patch for krita
+- gcc 4.1.0:
+    - add krita compile fixes
+    - add kspread compile fixes
+    - add kexi compile fixes
 
-* Fri Oct 14 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+* Thu Nov 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.2-2
+- remove xorg-x11-devel BR
+- rebuild
+
+* Sun Oct 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-1
 - version upgrade
 
 * Wed Sep 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.1-6
+- add patch for qt-3.3.5 problem
+- get devel working
+
+* Tue Sep 27 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.1-5
-- rebuild
+- try to fix devel build
 
 * Tue Aug 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.1-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Oct 2005 23:11:32 -0000	1.6
+++ sources	16 Apr 2006 22:05:51 -0000	1.7
@@ -1 +1 @@
-6b456fb7d54c84b11396b27a96ae0cf8  koffice-1.4.2.tar.bz2
+220b6bde28b5ebd5c6621bc87ca2c05f  koffice-1.5.0.tar.bz2


--- koffice-CAN-2005-3193.diff DELETED ---


--- koffice-krita-kisfilter.patch DELETED ---

More information about the fedora-extras-commits mailing list