rpms/koffice/devel .cvsignore, 1.16, 1.17 koffice.spec, 1.71, 1.72 sources, 1.16, 1.17
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue May 27 20:57:39 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1208
Modified Files:
.cvsignore koffice.spec sources
Log Message:
First rough-cut at koffice2.
* Tue May 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8-1
- koffice-1.9.95.8
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 4 Jun 2007 18:56:32 -0000 1.16
+++ .cvsignore 27 May 2008 20:56:46 -0000 1.17
@@ -1,5 +1 @@
-koffice-1.6.0.tar.bz2
-koffice-1.6.1.tar.bz2
-koshell.png
-koffice-1.6.2.tar.bz2
-koffice-1.6.3.tar.bz2
+koffice-1.9.95.8.tar.bz2
Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- koffice.spec 22 Feb 2008 18:57:17 -0000 1.71
+++ koffice.spec 27 May 2008 20:56:46 -0000 1.72
@@ -1,72 +1,62 @@
Name: koffice
-Version: 1.6.3
-Release: 15%{?dist}
+Version: 1.9.95.8
+Release: 1%{?dist}
Summary: An integrated office suite
Group: Applications/Productivity
# apps GPLv2+, libs LGPLv2+
License: GPLv2+
URL: http://www.koffice.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
+Source0: http://download.kde.org/unstable/koffice-%{version}/src/koffice-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source100: koshell.png
-
-# http://www.kde.org/info/security/advisory-20070730-1.txt
-Patch1: ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff
-
-# http://www.kde.org/info/security/advisory-20071107-1.txt
-Patch2: ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
-
-# upstream patch pulled via: svn diff -c 738929
-# svn diff -c 729276 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
-# svn diff -c 738929 svn://anonsvn.kde.org/home/kde/branches/koffice/1.6/
-Patch3: koffice-1.6.3-gcc43.patch
-
-# BuildRequires: world-devel ;)
-BuildRequires: kdelibs3-devel
-# See http://bugzilla.redhat.com/244091
-%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
-## kjsembed bits, afaict, not really used (yet) -- Rex
-#BuildRequires: kdebindings-devel
-BuildRequires: freetype-devel
-BuildRequires: fontconfig-devel
-BuildRequires: libart_lgpl-devel
-BuildRequires: libpng-devel
-BuildRequires: libtiff-devel
-BuildRequires: libjpeg-devel
-BuildRequires: GraphicsMagick-devel
-BuildRequires: ImageMagick-devel
-BuildRequires: bzip2-devel
-BuildRequires: zlib-devel
-BuildRequires: openssl-devel
-BuildRequires: python-devel
-BuildRequires: pcre-devel
-BuildRequires: libwpd-devel
-BuildRequires: lcms-devel
-BuildRequires: gettext-devel
-BuildRequires: mysql-devel
-BuildRequires: desktop-file-utils
-BuildRequires: perl
-BuildRequires: wv2-devel
-BuildRequires: libpqxx-devel
-BuildRequires: doxygen
-BuildRequires: aspell-devel
-BuildRequires: libxslt-devel
-BuildRequires: OpenEXR-devel
-BuildRequires: libexif-devel
-BuildRequires: libGL-devel libGLU-devel
-BuildRequires: readline-devel
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define ruby 1
-BuildRequires: ruby ruby-devel >= 1.8.2
-%endif
-BuildRequires: poppler-qt-devel
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
-BuildRequires: libpaper-devel
-BuildRequires: libXi-devel
-%endif
+#-- The following OPTIONAL packages could NOT be located on your system.
+#-- Consider installing them to enable more features from this software.
+#+ OpenCTL, 0.9.2: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
+#+ FreeTDS library: Kexi Sybase Migration driver requires FreeTDS library. The driver will not be built <http://www.freetds.org>
+#+ XBase library: Kexi XBase Migration driver requires XBase library. The driver will not be built <http://linux.techass.com/projects/xdb/>
+#+ GMM: The Krita Panorama plugin will not be built. <http://home.gna.org/getfem/download.html>
+#+ GLEW: The Krita shader filter plugin will not be built <http://glew.sourceforge.net>
+#+ Spnav: Spnav is the library which is required by the space navigator device plugin <http://spacenav.sourceforge.net/>
+#+ poppler-qt4: The Krita PDF filter will not be built (version 0.6.x is currently required) <http://poppler.freedesktop.org>
+
+BuildRequires: boost-devel
+BuildRequires: bzip2-devel
+BuildRequires: cmake
+BuildRequires: desktop-file-utils
+BuildRequires: doxygen
+BuildRequires: eigen-devel
+BuildRequires: exiv2-devel
+BuildRequires: fontconfig-devel
+BuildRequires: freeglut-devel
+BuildRequires: freetype-devel
+BuildRequires: gettext-devel
+BuildRequires: giflib-devel
+BuildRequires: GraphicsMagick-devel
+BuildRequires: gsl-devel
+BuildRequires: kdelibs4-devel
+BuildRequires: kdepimlibs-devel
+BuildRequires: lcms-devel
+BuildRequires: libGL-devel libGLU-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: libpqxx-devel
+BuildRequires: libtiff-devel
+BuildRequires: libwpd-devel
+BuildRequires: libxslt-devel
+BuildRequires: mysql-devel
+BuildRequires: OpenEXR-devel
+BuildRequires: openldap-devel
+BuildRequires: pcre-devel
+BuildRequires: perl
+BuildRequires: poppler-qt4-devel
+BuildRequires: python-devel
+BuildRequires: qca2-devel
+BuildRequires: qimageblitz-devel
+BuildRequires: readline-devel
+BuildRequires: ruby-devel ruby
+BuildRequires: wv2-devel
%description
KOffice is an integrated office suite.
@@ -99,8 +89,7 @@
Summary: Core support files for koffice
Group: Applications/Productivity
Requires: %{name}-libs = %{version}-%{release}
-Requires: perl
-Conflicts: koffice-i18n < 4:%{version}
+#Conflicts: koffice-i18n < 4:%{version}
%description core
%{summary}.
@@ -108,8 +97,7 @@
%package libs
Summary: Runtime libraries for koffice
Group: System Environment/Libraries
-Conflicts: koffice <= 4:%{version}-%{release}
-Requires: kdelibs3 >= %{kdelibs_ver}
+#Conflicts: koffice <= 4:%{version}-%{release}
%description libs
%{summary}.
@@ -117,6 +105,7 @@
Summary: Libraries needed for koffice development
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
+Requires: kdelibs4-devel
%description devel
%{summary}
@@ -149,8 +138,6 @@
Summary: A flowcharting application
Group: Applications/Productivity
Requires: %{name}-core = %{version}-%{release}
-# why? omit for now -- Rex
-#Requires: kdegraphics
Obsoletes: kivio < %{version}-%{release}
%description kivio
@@ -243,86 +230,43 @@
%prep
%setup -q
-%patch1 -p0 -b .CVE-2007-3387
-%patch2 -p0 -b .CVE-2007-4352-5392-5393
-%patch3 -p1 -b .gcc43
-
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure \
- --disable-rpath --disable-dependency-tracking \
- --enable-new-ldflags \
- --disable-debug --disable-warnings \
- --with-pic --enable-shared --disable-static \
- --with-extra-libs=%{_libdir} \
- --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
- --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
- --enable-final
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
-make %{?_smp_mflags}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-[ ! -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/koshell.png ] && \
-install -p -D -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/koshell.png
+%install
+rm -rf %{buildroot}
-# Replace absolute symlinks with relative ones
-pushd $RPM_BUILD_ROOT%{_docdir}/HTML
-for lang in *; do
- if [ -d $lang ]; then
- pushd $lang
- for i in */*; do
- [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
- done
- popd
- fi
-done
-popd
+make install DESTDIR=%{buildroot} -C %{_target_platform}
-desktop-file-install \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
- --vendor="" \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
-
-## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
-## until http://bugzilla.redhat.com/245190 is fixed
-for desktop_file in $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/*.desktop ; do
- grep "^NoDisplay=" ${desktop_file} || \
- echo "NoDisplay=True" >> ${desktop_file}
-done
-
-## Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-# shouldn't these be in koffice-l10n?
-rm -f $RPM_BUILD_ROOT%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
+# unpackaged files
+rm -f %{buildroot}%{_kde4_libdir}/lib*common.so
+rm -f %{buildroot}%{_kde4_libdir}/lib*filters.so
+rm -f %{buildroot}%{_kde4_libdir}/lib*private.so
+rm -f %{buildroot}%{_kde4_libdir}/libkrita*.so
+rm -f %{buildroot}%{_kde4_libdir}/libkross*.so
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post core
-touch --no-create %{_datadir}/icons/crystalsvg ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-touch --no-create %{_datadir}/icons/locolor || :
-gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+touch --no-create %{_kde4_datadir}/icons/hicolor || :
+gtk-update-icon-cache -q %{_kde4_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
%postun core
-touch --no-create %{_datadir}/icons/crystalsvg ||:
-touch --no-create %{_datadir}/icons/hicolor || :
-touch --no-create %{_datadir}/icons/locolor || :
-gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+touch --no-create %{_kde4_datadir}/icons/hicolor || :
+gtk-update-icon-cache -q %{_kde4_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
%post kword -p /sbin/ldconfig
@@ -352,341 +296,330 @@
%files core
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING.LIB README
-%{_bindir}/koshell
-%{_bindir}/kthesaurus
-%{_bindir}/koconverter
-%{_libdir}/libkdeinit_koshell.so
-%{_libdir}/libkdeinit_kthesaurus.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.*
-%{_libdir}/kde3/koshell.*
-%{_libdir}/kde3/kthesaurus.*
-%{_libdir}/kde3/kwmailmerge_classic.*
-%{_libdir}/kde3/kwmailmerge_kabc.*
-%{_libdir}/kde3/kwmailmerge_qtsqldb_power.*
-%{_libdir}/kde3/kwmailmerge_qtsqldb.*
-%{_libdir}/kde3/libkounavailpart.*
-%{_libdir}/kde3/libkprkword.*
-%{_libdir}/kde3/libthesaurustool.*
-%{_libdir}/kde3/clipartthumbnail.*
-%{_datadir}/apps/koffice/
-%{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/koshell/
-%{_datadir}/apps/thesaurus/
-%{_datadir}/config.kcfg/koshell.kcfg
-%{_datadir}/doc/HTML/en/koffice/
-%{_datadir}/doc/HTML/en/koshell/
-%{_datadir}/doc/HTML/en/thesaurus/
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/services/clipartthumbnail.desktop
-%{_datadir}/services/kfile*.desktop
-%{_datadir}/services/kwmailmerge*.desktop
-%{_datadir}/services/kodocinfopropspage.desktop
-%{_datadir}/services/kofficethumbnail.desktop
-%{_datadir}/services/kounavail.desktop
-%{_datadir}/services/kprkword.desktop
-%{_datadir}/services/thesaurustool.desktop
-%{_datadir}/servicetypes/kochart.desktop
-%{_datadir}/servicetypes/kofficepart.desktop
-%{_datadir}/servicetypes/koplugin.desktop
-%{_datadir}/servicetypes/kwmailmerge.desktop
-%{_datadir}/servicetypes/widgetfactory.desktop
-%{_datadir}/applications/kde/*koffice.desktop
-%{_datadir}/applications/kde/*KThesaurus.desktop
-%{_datadir}/applications/kde/*koshell.desktop
-%{_datadir}/apps/kofficewidgets/
-%{_datadir}/apps/kross/
-%{_libdir}/kde3/krosspython.*
-%{?ruby:%{_libdir}/kde3/krossruby.*}
+%{_kde4_bindir}/kthesaurus
+%{_kde4_bindir}/koconverter
+%{_kde4_libdir}/libkdeinit4_kthesaurus.so
+%{_kde4_libdir}/kde4/autocorrect.so
+%{_kde4_libdir}/kde4/changecase.so
+%{_kde4_libdir}/kde4/defaulttools.so
+%{_kde4_libdir}/kde4/kodocinfopropspage.*
+%{_kde4_libdir}/kde4/kofficescan.*
+%{_kde4_libdir}/kde4/kofficethumbnail.*
+%{_kde4_libdir}/kde4/libkounavailpart.*
+%{_kde4_libdir}/kde4/clipartthumbnail.*
+%{_kde4_libdir}/kde4/thesaurustool.so
+%{_kde4_libdir}/kde4/koffice_graya_u16_plugin.so
+%{_kde4_libdir}/kde4/kofficegrayau8plugin.so
+%{_kde4_libdir}/kde4/kofficedockers.so
+%{_kde4_libdir}/kde4/kofficesimpletextedit.so
+%{_kde4_libdir}/kde4/libpowerpointimport.so
+%{_kde4_libdir}/kde4/pgzkexireportpart2.so
+%{_kde4_libdir}/kde4/spellcheck.so
+%{_kde4_libdir}/kde4/textvariables.so
+%{_kde4_appsdir}/koffice/
+%{_kde4_docdir}/HTML/en/koffice/
+%{_kde4_docdir}/HTML/en/koshell/
+%{_kde4_docdir}/HTML/en/thesaurus/
+%{_kde4_datadir}/applications/kde4/KThesaurus.desktop
+%{_kde4_datadir}/icons/hicolor/*/*/*
+%{_kde4_datadir}/kde4/services/autocorrect.desktop
+%{_kde4_datadir}/kde4/services/changecase.desktop
+%{_kde4_datadir}/kde4/services/clipartthumbnail.desktop
+%{_kde4_datadir}/kde4/services/defaulttools.desktop
+%{_kde4_datadir}/kde4/services/kodocinfopropspage.desktop
+%{_kde4_datadir}/kde4/services/kofficethumbnail.desktop
+%{_kde4_datadir}/kde4/services/koffice_graya_u16_plugin.desktop
+%{_kde4_datadir}/kde4/services/kofficegrayaplugin.desktop
+%{_kde4_datadir}/kde4/services/kofficedockers.desktop
+%{_kde4_datadir}/kde4/services/kounavail.desktop
+%{_kde4_datadir}/kde4/services/thesaurustool.desktop
+%{_kde4_datadir}/kde4/services/kofficesimpletextedit.desktop
+%{_kde4_datadir}/kde4/services/spellcheck.desktop
+%{_kde4_datadir}/kde4/services/textvariables.desktop
+%{_kde4_datadir}/kde4/servicetypes/kochart.desktop
+%{_kde4_datadir}/kde4/servicetypes/kofficedocker.desktop
+%{_kde4_datadir}/kde4/servicetypes/kofficepart.desktop
+%{_kde4_datadir}/kde4/servicetypes/koplugin.desktop
+%{_kde4_datadir}/kde4/servicetypes/inlinetextobject.desktop
+%{_kde4_datadir}/kde4/servicetypes/kwmailmerge.desktop
+%{_kde4_datadir}/kde4/servicetypes/texteditingplugin.desktop
+%{_kde4_datadir}/kde4/servicetypes/textvariableplugin.desktop
+%{_kde4_datadir}/kde4/servicetypes/widgetfactory.desktop
+%{_kde4_datadir}/applications/kde4/*koffice.desktop
+%{_kde4_datadir}/kde4/services/*shape.desktop
+%{_kde4_appsdir}/formulashape/
+%{_kde4_appsdir}/musicshape/
+%dir %{_datadir}/color/
+%dir %{_datadir}/color/icc/
+%{_datadir}/color/icc/pigment/
+%{_kde4_datadir}/kde4/servicetypes/pigment*.desktop
+%{_kde4_libdir}/kde4/pathshapes.so
+%{_kde4_datadir}/kde4/services/pathshapes.desktop
%files libs
%defattr(-,root,root,-)
-#_libdir/libk*common.so.*
-%{_libdir}/libkarboncommon.so.*
-%{_libdir}/libkiviocommon.so.*
-%{_libdir}/libkspreadcommon.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}/libkformulalib.so.*
-%{_libdir}/libkopalette.so.*
-%{_libdir}/libkoproperty.so.*
-%{_libdir}/libkrossapi.so.*
-%{_libdir}/libkrossmain.so.*
+%{_kde4_datadir}/kde4/servicetypes/flake*.desktop
+%{_kde4_libdir}/libflake.so.*
+%{_kde4_libdir}/kde4/*shape.so
+%{_kde4_libdir}/libchartshapelib.so.*
+%{_kde4_libdir}/libkdchart.so.*
+%{_kde4_libdir}/libkochart.so.*
+%{_kde4_libdir}/libkotext.so.*
+%{_kde4_libdir}/libkowmf.so.*
+%{_kde4_libdir}/libkokross.so.*
+%{_kde4_libdir}/libkoguiutils.so.*
+%{_kde4_libdir}/libkomain.so.*
+%{_kde4_libdir}/libkoodf.so.*
+%{_kde4_libdir}/libkopageapp.so.*
+%{_kde4_libdir}/libkoresources.so.*
+%{_kde4_libdir}/libkoffice_graya_u16.so.*
+%{_kde4_libdir}/libkofficegrayau8colorspace.so.*
+%{_kde4_libdir}/libkstore.so.*
+%{_kde4_libdir}/libkwmf.so.*
+%{_kde4_libdir}/libkformulalib.so.*
+%{_kde4_libdir}/libkoproperty.so.*
+%{_kde4_libdir}/libpigmentcms.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
-%{_datadir}/doc/HTML/en/koffice-apidocs/
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkudesignercore.so
-%exclude %{_libdir}/libkdeinit_*.so
-
-%files kword
-%defattr(-,root,root,-)
-%{_bindir}/kword
-%{_libdir}/libkdeinit_kword.so
-%{_libdir}/libkwordprivate.so.*
-%{_libdir}/kde3/libkwordpart.*
-%{_libdir}/kde3/kword.*
-%{_datadir}/apps/kword/
-%{_datadir}/doc/HTML/en/kword/
-%{_datadir}/services/kword*.desktop
-%{_datadir}/services/kwserial*.desktop
-%{_datadir}/templates/TextDocument.desktop
-%{_datadir}/templates/.source/TextDocument.kwt
-%{_datadir}/applications/kde/*kword.desktop
+%{_kde4_libdir}/lib*.so
+%exclude %{_kde4_libdir}libkdeinit4_*.so
+%{_kde4_appsdir}/cmake/modules/FindKOfficeLibs.cmake
%files kspread
%defattr(-,root,root,-)
-%{_bindir}/kspread
-%{_libdir}/libkdeinit_kspread.so
-#{_libdir}/libkspreadcommon.so.*
-%{_libdir}/kde3/kspread.*
-%{_libdir}/kde3/libkspreadpart.*
-%{_libdir}/kde3/kwmailmerge_kspread.*
-%{_libdir}/kde3/libcsvexport.*
-%{_libdir}/kde3/libcsvimport.*
-%{_libdir}/kde3/libgnumericexport.*
-%{_libdir}/kde3/libgnumericimport.*
-%{_libdir}/kde3/libkspreadhtmlexport.*
-%{_libdir}/kde3/libkspreadinsertcalendar.*
-%{_libdir}/kde3/libopencalcexport.*
-%{_libdir}/kde3/libopencalcimport.*
-%{_libdir}/kde3/libqproimport.*
-%{_libdir}/kde3/kspreadscripting.*
-%{_libdir}/kde3/krosskspreadcore.*
-%{_datadir}/apps/kspread/
-%{_datadir}/doc/HTML/en/kspread/
-%{_datadir}/services/kspread*.desktop
-%{_datadir}/templates/SpreadSheet.desktop
-%{_datadir}/templates/.source/SpreadSheet.kst
-%{_datadir}/applications/kde/*kspread.desktop
+%{_kde4_bindir}/kspread
+%{_kde4_libdir}/libkdeinit4_kspread.so
+%{_kde4_libdir}/libkspreadcommon.so.*
+%{_kde4_libdir}/kde4/krossmodulekspread.so
+%{_kde4_libdir}/kde4/libkspreadpart.*
+%{_kde4_libdir}/kde4/libcsvexport.*
+%{_kde4_libdir}/kde4/libcsvimport.*
+%{_kde4_libdir}/kde4/libgnumericexport.*
+%{_kde4_libdir}/kde4/libgnumericimport.*
+%{_kde4_libdir}/kde4/libkspreadhtmlexport.*
+%{_kde4_libdir}/kde4/libkspreadinsertcalendar.*
+%{_kde4_libdir}/kde4/libkspreadsolver.so
+%{_kde4_libdir}/kde4/libopencalcexport.*
+%{_kde4_libdir}/kde4/libopencalcimport.*
+%{_kde4_libdir}/kde4/libqproimport.*
+%{_kde4_appsdir}/kspread/
+%{_kde4_docdir}/HTML/en/kspread/
+%{_kde4_datadir}/config.kcfg/kspread.kcfg
+%{_kde4_datadir}/kde4/services/kspread*.desktop
+%{_kde4_datadir}/templates/SpreadSheet.desktop
+%{_kde4_datadir}/templates/.source/SpreadSheet.kst
+%{_kde4_datadir}/applications/kde4/*kspread.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kspread_konqi.desktop
+%{_kde4_datadir}/kde4/services/krossmodulekspread.desktop
%files kpresenter
%defattr(-,root,root,-)
-%{_bindir}/kpresenter
-%{_bindir}/kprconverter.pl
-%{_libdir}/libkdeinit_kpresenter.so
-%{_libdir}/libkpresenterimageexport.so.*
-%{_libdir}/libkpresenterprivate.so.*
-%{_libdir}/kde3/*kpresenter*.*
-%{_datadir}/apps/kpresenter/
-%{_datadir}/doc/HTML/en/kpresenter/
-%{_datadir}/services/kpresenter*.desktop
-%{_datadir}/templates/Presentation.desktop
-%{_datadir}/templates/.source/Presentation.kpt
-%{_datadir}/applications/kde/*kpresenter.desktop
+%{_kde4_bindir}/kpresenter
+%{_kde4_libdir}/libkdeinit4_kpresenter.so
+%{_kde4_libdir}/libkpresenterprivate.so.*
+%{_kde4_libdir}/kde4/*kpresenter*.*
+%{_kde4_libdir}/kde4/kpr_*.*
+%{_kde4_appsdir}/kpresenter/
+%{_kde4_docdir}/HTML/en/kpresenter/
+%{_kde4_datadir}/kde4/services/kpr*.desktop
+%{_kde4_datadir}/kde4/servicetypes/kpr*.desktop
+%{_kde4_datadir}/templates/Presentation.desktop
+%{_kde4_datadir}/templates/.source/Presentation.kpt
+%{_kde4_datadir}/applications/kde4/*kpresenter.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kpresenter_konqi.desktop
%files karbon
%defattr(-,root,root,-)
-%{_bindir}/karbon
-%{_libdir}/libkdeinit_karbon.so
-#{_libdir}/libkarboncommon.so.*
-%{_libdir}/kde3/*karbon*.*
-%{_libdir}/kde3/libwmfexport.*
-%{_libdir}/kde3/libwmfimport.*
-%{_datadir}/apps/karbon/
-%{_datadir}/services/karbon*
-%{_datadir}/servicetypes/karbon_module.desktop
-%{_datadir}/templates/Illustration.desktop
-%{_datadir}/templates/.source/Illustration.karbon
-%{_datadir}/applications/kde/*karbon.desktop
-%{_datadir}/doc/HTML/en/karbon/
+%{_kde4_bindir}/karbon
+%{_kde4_libdir}/libkdeinit4_karbon.so
+%{_kde4_libdir}/libkarboncommon.so.*
+%{_kde4_libdir}/libkarbonui.so.*
+%{_kde4_libdir}/kde4/*karbon*.*
+%{_kde4_libdir}/kde4/libwmfexport.*
+%{_kde4_libdir}/kde4/libwmfimport.*
+%{_kde4_appsdir}/karbon/
+%{_kde4_datadir}/kde4/services/karbon*
+%{_kde4_datadir}/kde4/servicetypes/karbon_module.desktop
+%{_kde4_datadir}/templates/Illustration.desktop
+%{_kde4_datadir}/templates/.source/Illustration.karbon
+%{_kde4_datadir}/applications/kde4/*karbon.desktop
+%{_kde4_docdir}/HTML/en/karbon/
+%{_kde4_datadir}/kde4/services/ServiceMenus/karbon_konqi.desktop
%files krita
%defattr(-,root,root,-)
-%{_bindir}/krita
-%{_libdir}/libkdeinit_krita.so
-%{_libdir}/libkrita*.so.*
-%{_libdir}/kde3/*krita*.*
-%{_datadir}/apps/krita/
-%{_datadir}/services/krita*.desktop
-%{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/kde/*krita*.desktop
-%{_datadir}/applnk/.hidden/*krita*.desktop
-%{_datadir}/apps/kritaplugins/
-%{_datadir}/doc/HTML/en/krita/
+%{_kde4_bindir}/krita
+%{_kde4_libdir}/libkdeinit4_krita.so
+%{_kde4_libdir}/libkrita*.so.*
+%{_kde4_libdir}/libkisexiv2.so.*
+%{_kde4_libdir}/kde4/*krita*.*
+%{_kde4_libdir}/libkrossmodulekrita.so.*
+%{_kde4_appsdir}/krita/
+%{_kde4_datadir}/kde4/services/krita*.desktop
+%{_kde4_datadir}/kde4/servicetypes/krita*.desktop
+%{_kde4_datadir}/applications/kde4/*krita*.desktop
+# FIXME: add scriptlet
+%{_datadir}/mime/packages/krita_ora.xml
+%{_kde4_appsdir}/kritaplugins/
+%{_kde4_docdir}/HTML/en/krita/
+%{_datadir}/color/icc/krita/
+%{_kde4_datadir}/kde4/services/ServiceMenus/krita_konqi.desktop
%files kugar
%defattr(-,root,root,-)
-%{_bindir}/kugar
-%{_bindir}/kudesigner
-%{_libdir}/libkdeinit_kugar.so
-%{_libdir}/libkdeinit_kudesigner.so
-%{_libdir}/libkugarlib.so.*
-%{_libdir}/libkudesignercore.so
-%{_libdir}/kde3/kudesigner.*
-%{_libdir}/kde3/kugar.*
-%{_libdir}/kde3/libkudesignerpart.*
-%{_libdir}/kde3/libkugarpart.*
-%{_datadir}/apps/kudesigner/
-%{_datadir}/apps/kugar/
-%{_datadir}/doc/HTML/en/kugar/
-%{_datadir}/services/kugar*.desktop
-%{_datadir}/applications/kde/*kugar.desktop
-%{_datadir}/applications/kde/*kudesigner.desktop
+%{_kde4_docdir}/HTML/en/kugar/
%files kexi
%defattr(-,root,root,-)
-%{_bindir}/kexi*
-%{_bindir}/ksqlite*
-%{_bindir}/krossrunner
-%{_libdir}/libkdeinit_kexi.so
-%{_libdir}/libkexi*.so.*
-%{_libdir}/libkformdesigner.so.*
-%{_libdir}/kde3/kformdesigner_*.*
-%{_libdir}/kde3/kexidb_sqlite2driver.*
-%{_libdir}/kde3/kexidb_sqlite3driver.*
-%{_libdir}/kde3/kexihandler_*.*
-%{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/krosskexiapp.*
-%{_libdir}/kde3/krosskexidb.*
-%{_datadir}/config/kexirc
-%{_datadir}/config/magic/kexi.magic
-%{_datadir}/mimelnk/application/*
-%{_datadir}/servicetypes/kexi*.desktop
-%{_datadir}/services/kexi
-%{_datadir}/apps/kexi/
-%{_datadir}/services/kformdesigner/*
-%{_datadir}/doc/HTML/en/kexi/
-%{_datadir}/applications/kde/*kexi.desktop
-%{_datadir}/services/kexidb_sqlite*driver.desktop
-# shouldn't this be in koffice-l10n?
-#%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/kexi*
+%{_kde4_bindir}/kexi*
+%{_kde4_bindir}/ksqlite*
+%{_kde4_libdir}/libkexi*.so.*
+%{_kde4_libdir}/libkformdesigner.so.*
+%{_kde4_libdir}/kde4/kformdesigner_*.*
+%{_kde4_libdir}/kde4/kexidb_sqlite3driver.*
+%{_kde4_libdir}/kde4/kexihandler_*.*
+%{_kde4_libdir}/kde4/krossmodulekexidb.so
+%{_kde4_datadir}/config/kexirc
+%{_kde4_datadir}/kde4/servicetypes/kexi*.desktop
+%{_kde4_datadir}/kde4/services/kexi
+%{_kde4_appsdir}/kexi/
+%{_kde4_datadir}/kde4/services/kformdesigner/*
+%{_kde4_docdir}/HTML/en/kexi/
+%{_kde4_datadir}/applications/kde4/*kexi.desktop
+%{_kde4_datadir}/kde4/services/kexidb_sqlite*driver.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kexi_konqi.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
+%{_kde4_libdir}/kde4/kexidb_mysqldriver.*
+%{_kde4_libdir}/kde4/keximigrate_mysql.*
+%{_kde4_datadir}/kde4/services/keximigrate_mysql.desktop
+%{_kde4_datadir}/kde4/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
+%{_kde4_libdir}/kde4/kexidb_pqxxsqldriver.*
+%{_kde4_libdir}/kde4/keximigrate_pqxx.*
+%{_kde4_datadir}/kde4/services/kexidb_pqxxsqldriver.desktop
+%{_kde4_datadir}/kde4/services/keximigrate_pqxx.desktop
%files kchart
%defattr(-,root,root,-)
-%{_bindir}/kchart
-%{_libdir}/libkchart*.so.*
-%{_libdir}/libkdeinit_kchart.so
-%{_libdir}/kde3/*kchart*.*
-%{_datadir}/apps/kchart/
-%{_datadir}/services/kchart*.desktop
-%{_datadir}/doc/HTML/en/kchart/
-%{_datadir}/applications/kde/*kchart.desktop
+%{_kde4_bindir}/kchart
+%{_kde4_libdir}/libkchartcommon.so.*
+%{_kde4_libdir}/libkdeinit4_kchart.so
+%{_kde4_libdir}/kde4/*kchart*.*
+%{_kde4_appsdir}/kchart/
+%{_kde4_datadir}/config.kcfg/kchart.kcfg
+%{_kde4_datadir}/kde4/services/kchart*.desktop
+%{_kde4_docdir}/HTML/en/kchart/
+%{_kde4_datadir}/applications/kde4/*kchart.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kchart_konqi.desktop
%files kformula
%defattr(-,root,root,-)
-%{_bindir}/kformula
-%{_libdir}/libkdeinit_kformula.so
-%{_libdir}/kde3/*kformula*.*
-%{_datadir}/apps/kformula/
-%{_datadir}/doc/HTML/en/kformula/
-%{_datadir}/services/kformula*.desktop
-%{_datadir}/applications/kde/*kformula.desktop
+%{_kde4_bindir}/kformula
+%{_kde4_libdir}/libkdeinit4_kformula.so
+%{_kde4_libdir}/libkformulaprivate.so.*
+%{_kde4_libdir}/kde4/*kformula*.*
+%{_kde4_appsdir}/kformula/
+%{_kde4_docdir}/HTML/en/kformula/
+%{_kde4_datadir}/kde4/services/kformula*.desktop
+%{_kde4_datadir}/applications/kde4/*kformula.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kformula_konqi.desktop
%files kivio
%defattr(-,root,root,-)
-%{_bindir}/kivio
-%{_libdir}/libkdeinit_kivio.so
-#{_libdir}/libkiviocommon.so.*
-%{_libdir}/kde3/*kivio*.*
-%{_libdir}/kde3/straight_connector.*
-%{_datadir}/apps/kivio/
-%{_datadir}/config.kcfg/kivio.kcfg
-%{_datadir}/doc/HTML/en/kivio/
-%{_datadir}/services/kivio*.desktop
-%{_datadir}/applications/kde/*kivio.desktop
+%{_kde4_bindir}/kivio
+%{_kde4_libdir}/libkdeinit4_kivio.so
+%{_kde4_libdir}/libkivioprivate.so.*
+%{_kde4_libdir}/kde4/*kivio*.*
+%{_kde4_appsdir}/kivio/
+%{_kde4_docdir}/HTML/en/kivio/
+%{_kde4_datadir}/kde4/services/kivio*.desktop
+%{_kde4_datadir}/applications/kde4/kivio.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kivio_konqi.desktop
%files filters
%defattr(-,root,root,-)
-%{_libdir}/libkwordexportfilters.so.*
-%{_libdir}/kde3/libabiwordexport.*
-%{_libdir}/kde3/libabiwordimport.*
-%{_libdir}/kde3/libamiproexport.*
-%{_libdir}/kde3/libamiproimport.*
-%{_libdir}/kde3/libapplixspreadimport.*
-%{_libdir}/kde3/libapplixwordimport.*
-%{_libdir}/kde3/libasciiexport.*
-%{_libdir}/kde3/libasciiimport.*
-%{_libdir}/kde3/libdbaseimport.*
-%{_libdir}/kde3/libdocbookexport.*
-%{_libdir}/kde3/libexcelimport.*
-%{_libdir}/kde3/libgenerickofilter.*
-%{_libdir}/kde3/libhtmlexport.*
-%{_libdir}/kde3/libhtmlimport.*
-%{_libdir}/kde3/libkarbonepsimport.*
-%{_libdir}/kde3/libkfolatexexport.*
-%{_libdir}/kde3/libkfomathmlexport.*
-%{_libdir}/kde3/libkfomathmlimport.*
-%{_libdir}/kde3/libkfopngexport.*
-%{_libdir}/kde3/libkspreadlatexexport.*
-%{_libdir}/kde3/libkugarnopimport.*
-%{_libdir}/kde3/libkwordkword1dot3import.*
-%{_libdir}/kde3/libkwordlatexexport.*
-%{_libdir}/kde3/libmswriteexport.*
-%{_libdir}/kde3/libmswriteimport.*
-%{_libdir}/kde3/libooimpressexport.*
-%{_libdir}/kde3/libooimpressimport.*
-%{_libdir}/kde3/liboowriterexport.*
-%{_libdir}/kde3/liboowriterimport.*
-%{_libdir}/kde3/libpalmdocexport.*
-%{_libdir}/kde3/libpalmdocimport.*
-%{_libdir}/kde3/libpdfimport.*
-%{_libdir}/kde3/librtfexport.*
-%{_libdir}/kde3/librtfimport.*
-%{_libdir}/kde3/libwmlexport.*
-%{_libdir}/kde3/libwmlimport.*
-%{_libdir}/kde3/libwpexport.*
-%{_libdir}/kde3/libwpimport.*
-%{_libdir}/kde3/libmswordimport.*
-%{_libdir}/kde3/libxsltimport.*
-%{_libdir}/kde3/libxsltexport.*
-%{_libdir}/kde3/libhancomwordimport.*
-%{_libdir}/kde3/libkfosvgexport.*
-%{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libkspreadkexiimport.*
-%{_libdir}/kde3/libolefilter.*
-%{_datadir}/apps/xsltfilter/
-%{_datadir}/services/generic_filter.desktop
-%{_datadir}/services/ole_powerpoint97_import.desktop
-%{_datadir}/services/xslt*.desktop
-%{_datadir}/servicetypes/kofilter*.desktop
+%{_kde4_libdir}/libkwordexportfilters.so.*
+%{_kde4_libdir}/kde4/libabiwordexport.*
+%{_kde4_libdir}/kde4/libabiwordimport.*
+%{_kde4_libdir}/kde4/libamiproexport.*
+%{_kde4_libdir}/kde4/libamiproimport.*
+%{_kde4_libdir}/kde4/libapplixspreadimport.*
+%{_kde4_libdir}/kde4/libapplixwordimport.*
+%{_kde4_libdir}/kde4/libasciiexport.*
+%{_kde4_libdir}/kde4/libasciiimport.*
+%{_kde4_libdir}/kde4/libdbaseimport.*
+%{_kde4_libdir}/kde4/libdocbookexport.*
+%{_kde4_libdir}/kde4/libexcelimport.*
+%{_kde4_libdir}/kde4/libgenerickofilter.*
+%{_kde4_libdir}/kde4/libhtmlexport.*
+%{_kde4_libdir}/kde4/libhtmlimport.*
+%{_kde4_libdir}/kde4/libkspreadlatexexport.*
+%{_kde4_libdir}/kde4/libkwordkword1dot3import.*
+%{_kde4_libdir}/kde4/libmswriteexport.*
+%{_kde4_libdir}/kde4/libmswriteimport.*
+%{_kde4_libdir}/kde4/liboowriterexport.*
+%{_kde4_libdir}/kde4/liboowriterimport.*
+%{_kde4_libdir}/kde4/libpalmdocexport.*
+%{_kde4_libdir}/kde4/libpalmdocimport.*
+%{_kde4_libdir}/kde4/librtfexport.*
+%{_kde4_libdir}/kde4/librtfimport.*
+%{_kde4_libdir}/kde4/libwmlexport.*
+%{_kde4_libdir}/kde4/libwmlimport.*
+%{_kde4_libdir}/kde4/libwpexport.*
+%{_kde4_libdir}/kde4/libwpimport.*
+%{_kde4_libdir}/kde4/libmswordimport.*
+%{_kde4_libdir}/kde4/libxsltimport.*
+%{_kde4_libdir}/kde4/libxsltexport.*
+%{_kde4_libdir}/kde4/libhancomwordimport.*
+%{_kde4_appsdir}/xsltfilter/
+%{_kde4_datadir}/kde4/services/generic_filter.desktop
+%{_kde4_datadir}/kde4/services/xslt*.desktop
+%{_kde4_datadir}/kde4/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/kde/*kplato.desktop
+%{_kde4_bindir}/kplato
+%{_kde4_bindir}/kplatowork
+%{_kde4_libdir}/libkdeinit4_kplato.so
+%{_kde4_libdir}/libkdeinit4_kplatowork.so
+%{_kde4_libdir}/kde4/libkplatopart.*
+%{_kde4_libdir}/kde4/libkplatoworkpart.so
+%{_kde4_libdir}/libkplato*.so.*
+%{_kde4_libdir}/kde4/krossmodulekplato.so
+%{_kde4_datadir}/kde4/services/krossmodulekplato.desktop
+%{_kde4_appsdir}/kplato/
+%{_kde4_appsdir}/kplatowork
+%{_kde4_docdir}/HTML/en/kplato/
+%{_kde4_datadir}/kde4/services/kplato*.desktop
+%{_kde4_datadir}/applications/kde4/kplato.desktop
+%{_kde4_datadir}/applications/kde4/kplatowork.desktop
+%files kword
+%defattr(-,root,root,-)
+%{_kde4_bindir}/kword
+%{_kde4_libdir}/libkdeinit4_kword.so
+%{_kde4_libdir}/libkwordprivate.so.*
+%{_kde4_libdir}/kde4/krossmodulekword.so
+%{_kde4_libdir}/kde4/libkwordpart.*
+%{_kde4_appsdir}/kword/
+%{_kde4_docdir}/HTML/en/kword/
+%{_kde4_datadir}/kde4/services/*kword*.desktop
+%{_kde4_datadir}/templates/TextDocument.desktop
+%{_kde4_datadir}/templates/.source/TextDocument.kwt
+%{_kde4_datadir}/applications/kde4/*kword.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/kword_konqi.desktop
%changelog
-* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org>
-1.6.3-15
+* Tue May 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8-1
+- koffice-1.9.95.8
+
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 1.6.3-15
- upstream gcc43 patch (#433994)
- kivio: omit Requires: kdegraphics, use versioned Obsoletes
- touchup %%descriptions, %%summaries
@@ -694,17 +627,14 @@
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.3-14
- Autorebuild for GCC 4.3
-* Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.3-13
+* Fri Nov 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.6.3-13
- CVE-2007-4352 CVE-2007-5392 CVE-2007-5393 (#372611)
-* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.3-12
+* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.6.3-12
- rebuild (for openexr-1.6.0)
- -libs: %%post/%%postun -p /sbin/ldconfig
-* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.3-11
+* Wed Sep 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.6.3-11
- rebuild (for poppler)
- re-enable (kross)ruby support (f8+)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 4 Jun 2007 18:56:32 -0000 1.16
+++ sources 27 May 2008 20:56:46 -0000 1.17
@@ -1,2 +1 @@
-03382edf62db9913b57ad8760c7d5f52 koshell.png
-386d388094734f9759977c3267098e30 koffice-1.6.3.tar.bz2
+6543af9edb3ac2cd573eec95c59e065f koffice-1.9.95.8.tar.bz2
More information about the fedora-extras-commits
mailing list