rpms/koffice/devel .cvsignore, 1.6, 1.7 koffice.spec, 1.21, 1.22 sources, 1.6, 1.7 koffice-CAN-2005-3193.diff, 1.1, NONE koffice-kexi.patch, 1.1, NONE koffice-krita-kisclipboard.patch, 1.1, NONE koffice-krita-kisfilter.patch, 1.1, NONE koffice-kspread.patch, 1.1, NONE koffice-qt3.3.5.patch, 1.9, NONE
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Thu Feb 2 12:47:27 UTC 2006
Author: awjb
Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20226
Modified Files:
.cvsignore koffice.spec sources
Removed Files:
koffice-CAN-2005-3193.diff koffice-kexi.patch
koffice-krita-kisclipboard.patch koffice-krita-kisfilter.patch
koffice-kspread.patch koffice-qt3.3.5.patch
Log Message:
- upgrade to 1.5-beta1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 15 Oct 2005 23:14:13 -0000 1.6
+++ .cvsignore 2 Feb 2006 12:47:27 -0000 1.7
@@ -1 +1 @@
-koffice-1.4.2.tar.bz2
+koffice-1.4.90.tar.bz2
Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- koffice.spec 15 Dec 2005 13:45:28 -0000 1.21
+++ koffice.spec 2 Feb 2006 12:47:27 -0000 1.22
@@ -1,24 +1,17 @@
Name: koffice
-Version: 1.4.2
-Release: 3%{?dist}
+Version: 1.4.90
+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: http://download.kde.org/unstable/koffice-1.5-beta1/src/koffice-1.4.90.tar.bz2
Source100: koshell.png
# stuff for the build configuration
Patch0: koffice-admin-gcc4isok.patch
-# fix CAN-2005-3193 see #175260
-Patch1: koffice-CAN-2005-3193.diff
-
-Patch100: koffice-krita-kisfilter.patch
-Patch101: koffice-krita-kisclipboard.patch
-Patch102: koffice-kspread.patch
-Patch103: koffice-kexi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# BuildRequires: world-devel ;)
@@ -60,6 +53,7 @@
BuildRequires: aspell-devel
BuildRequires: libacl-devel
BuildRequires: libxslt-devel
+BuildRequires: OpenEXR-devel
%description
KOffice - Integrated Office Suite
@@ -82,6 +76,7 @@
Requires: koffice-kchart
Requires: koffice-kformula
Requires: koffice-filters
+Requires: koffice-plato
%description suite
KOffice - Integrated Office Suite
@@ -196,14 +191,17 @@
%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
-%patch101 -p4
-%patch102 -p4
-%patch103 -p4
# this will make sure that patch0 is considered
make -f admin/Makefile.common
@@ -256,12 +254,12 @@
$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
+# 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 \
@@ -308,6 +306,41 @@
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
--add-category=X-Fedora \
--delete-original \
+ $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_jpeg.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_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
@@ -355,7 +388,27 @@
--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
+
+#writeup
+desktop-file-install \
+ --vendor=fedora \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+ --add-category=X-Fedora \
+ --delete-original \
+ $RPM_BUILD_ROOT%{_datadir}/applnk/Office/writeup.desktop
+
+
+# maybe we should try without la again...
+find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} \;
%clean
rm -rf $RPM_BUILD_ROOT
@@ -396,13 +449,15 @@
%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
@@ -412,7 +467,6 @@
%{_libdir}/libkochart.*
%{_libdir}/libkofficecore.*
%{_libdir}/libkofficeui.*
-%{_libdir}/libkoscript.*
%{_libdir}/libkotext.*
%{_libdir}/libkowmf.*
%{_libdir}/libkopainter.*
@@ -421,8 +475,12 @@
%{_libdir}/libkwmf.*
%{_libdir}/libkdeinit_kformula.*
%{_libdir}/libkformulalib.*
+%{_libdir}/libkopalette.*
+%{_libdir}/libkoproperty.*
%{_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.*
@@ -460,6 +518,20 @@
%{_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
+%{_datadir}/mimelnk/image/x-raw.desktop
+# add writeup here for now
+%{_bindir}/writeup
+%{_libdir}/kde3/libwriteup_part.*
+%{_libdir}/kde3/writeup.*
+%{_libdir}/libkdeinit_writeup.*
+%{_datadir}/applications/fedora-writeup.desktop
+%{_datadir}/apps/writeup
+%{_datadir}/services/writeuppart.desktop
%files devel
%{_includedir}/*
@@ -469,6 +541,7 @@
%defattr(-,root,root,-)
%{_bindir}/kword
%{_libdir}/libkdeinit_kword.*
+%{_libdir}/libkwordprivate.*
%{_libdir}/kde3/libkwordpart.*
%{_libdir}/kde3/kword.*
%{_datadir}/apps/kword
@@ -508,9 +581,18 @@
%{_bindir}/kpresenter
%{_bindir}/kprconverter.pl
%{_libdir}/libkdeinit_kpresenter.*
+%{_libdir}/libkpresenterimageexport.*
+%{_libdir}/libkpresenterprivate.*
%{_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
@@ -522,8 +604,8 @@
%defattr(-,root,root,-)
%{_bindir}/karbon
%{_libdir}/libkdeinit_karbon.*
-%{_libdir}/libkarbonbase.*
%{_libdir}/libkarboncommon.*
+%{_libdir}/kde3/karbon_defaulttools.*
%{_libdir}/kde3/karbon_flattenpathplugin.*
%{_libdir}/kde3/karbon_imagetoolplugin.*
%{_libdir}/kde3/karbon_insertknotsplugin.*
@@ -548,11 +630,24 @@
%{_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}/libkrita_cmyk_u16.*
+%{_libdir}/libkrita_gray_u16.*
+%{_libdir}/libkrita_lms_f32.*
+%{_libdir}/libkrita_rgb_f16half.*
+%{_libdir}/libkrita_rgb_f32.*
+%{_libdir}/libkrita_rgb_u16.*
+%{_libdir}/libkritacolor.*
+%{_libdir}/libkritagrayscale.*
+%{_libdir}/libkritaimage.*
+%{_libdir}/libkritargb.*
+%{_libdir}/libkritascripting.*
+%{_libdir}/libkritaui.*
%{_libdir}/libkritacommon.*
%{_libdir}/kde3/kritacimg.*
%{_libdir}/kde3/kritacolorrange.*
@@ -583,11 +678,44 @@
%{_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/kritacubismfilter.*
+%{_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.*
%{_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,-)
@@ -611,8 +739,6 @@
%files kexi
%defattr(-,root,root,-)
%{_bindir}/kexi
-%{_bindir}/keximigratetest
-%{_bindir}/kformdesigner
%{_bindir}/ksqlite*
%{_libdir}/libkdeinit_kexi.*
%{_libdir}/libkexicore.*
@@ -624,15 +750,17 @@
%{_libdir}/libkexiguiutils.*
%{_libdir}/libkeximain.*
%{_libdir}/libkeximigrate.*
-%{_libdir}/libkexipropertyeditor.*
%{_libdir}/libkexirelationsview.*
%{_libdir}/libkexisql2.*
%{_libdir}/libkexisql3.*
%{_libdir}/libkformdesigner.*
+%{_libdir}/libkexiutils.*
+%{_libdir}/kde3/kformdesigner_containers.*
+%{_libdir}/kde3/kformdesigner_kexidbwidgets.*
+%{_libdir}/kde3/kformdesigner_stdwidgets.*
%{_libdir}/kde3/kexidb_mysqldriver.*
%{_libdir}/kde3/kexidb_sqlite2driver.*
%{_libdir}/kde3/kexidb_sqlite3driver.*
-%{_libdir}/kde3/kexidbwidgets.*
%{_libdir}/kde3/kexihandler_form.*
%{_libdir}/kde3/kexihandler_migration.*
%{_libdir}/kde3/kexihandler_query.*
@@ -641,11 +769,16 @@
%{_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}/kde3/krosskritacore.*
+%{_libdir}/kde3/krosspython.*
+%{_libdir}/kde3/krossruby.*
+%{_libdir}/libkrossapi.*
+%{_libdir}/libkrossmain.*
%{_datadir}/config/kexirc
%{_datadir}/config/magic/kexi.magic
%{_datadir}/mimelnk/application/*
@@ -655,22 +788,26 @@
%{_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
+
%files kchart
%defattr(-,root,root,-)
%{_bindir}/kchart
%{_libdir}/libkchartcommon.*
%{_libdir}/libkdeinit_kchart.*
+%{_libdir}/libkchartimageexport.*
%{_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
@@ -691,14 +828,15 @@
%{_bindir}/kivio
%{_libdir}/libkdeinit_kivio.*
%{_libdir}/libkiviocommon.*
-%{_libdir}/libkivioconnectortool.*
-%{_libdir}/libkivioselecttool.*
-%{_libdir}/libkiviotargettool.*
-%{_libdir}/libkiviotexttool.*
-%{_libdir}/libkiviozoomtool.*
%{_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
@@ -733,7 +871,6 @@
%{_libdir}/kde3/libkwordlatexexport.*
%{_libdir}/kde3/libmswriteexport.*
%{_libdir}/kde3/libmswriteimport.*
-%{_libdir}/kde3/libolefilter.*
%{_libdir}/kde3/libooimpressexport.*
%{_libdir}/kde3/libooimpressimport.*
%{_libdir}/kde3/liboowriterexport.*
@@ -750,13 +887,31 @@
%{_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.*
+%{_libdir}/kde3/kplato.*
+%{_libdir}/kde3/libkplatopart.*
+%{_datadir}/apps/kplato
+%{_datadir}/doc/HTML/en/kplato
+%{_datadir}/services/kplatopart.desktop
+%{_datadir}/applications/fedora-kplato.desktop
+
%changelog
+* Wed Feb 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-1
+- version upgrade
+
* Thu Dec 08 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
1.4.2-3
- fix CAN-2005-3193
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 15 Oct 2005 23:14:13 -0000 1.6
+++ sources 2 Feb 2006 12:47:27 -0000 1.7
@@ -1 +1 @@
-6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2
+99a8de4e93b00e1c3148a5f96b67d966 koffice-1.4.90.tar.bz2
--- koffice-CAN-2005-3193.diff DELETED ---
--- koffice-kexi.patch DELETED ---
--- koffice-krita-kisclipboard.patch DELETED ---
--- koffice-krita-kisfilter.patch DELETED ---
--- koffice-kspread.patch DELETED ---
--- koffice-qt3.3.5.patch DELETED ---
More information about the scm-commits
mailing list