rpms/koffice/FC-5 koffice-1.6.0.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 koffice.spec, 1.40, 1.41 sources, 1.12, 1.13 koffice-admin-gcc4isok.patch, 1.1, NONE
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Sat Oct 21 07:52:29 UTC 2006
- Previous message (by thread): rpms/koffice/FC-4 koffice-1.6.0.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 koffice.spec, 1.17, 1.18 sources, 1.9, 1.10 koffice-admin-gcc4isok.patch, 1.1, NONE koffice-kexi-version.patch, 1.1, NONE
- Next message (by thread): rpms/wine/FC-3 .cvsignore, 1.19, 1.20 sources, 1.20, 1.21 wine.spec, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26922/FC-5
Modified Files:
.cvsignore koffice.spec sources
Added Files:
koffice-1.6.0.patch
Removed Files:
koffice-admin-gcc4isok.patch
Log Message:
- version upgrade
koffice-1.6.0.patch:
--- NEW FILE koffice-1.6.0.patch ---
--- lib/kross/python/cxx/Objects.hxx.orig 2006-10-19 00:00:02.000000000 +0200
+++ lib/kross/python/cxx/Objects.hxx 2006-10-19 00:02:04.000000000 +0200
@@ -1938,8 +1938,8 @@
if(map.hasKey(key)) the_item = map.getItem(key);
};
- ~mapref<T>()
- {}
+ // ~mapref<T>()
+ // {};
// MapBase<T> stuff
// lvalue
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 3 Aug 2006 09:15:25 -0000 1.12
+++ .cvsignore 21 Oct 2006 07:51:58 -0000 1.13
@@ -1 +1 @@
-koffice-1.5.2.tar.bz2
+koffice-1.6.0.tar.bz2
Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- koffice.spec 3 Aug 2006 09:15:25 -0000 1.40
+++ koffice.spec 21 Oct 2006 07:51:58 -0000 1.41
@@ -1,64 +1,53 @@
Name: koffice
-Version: 1.5.2
+Version: 1.6.0
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.2/src/koffice-1.5.2.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.6.0/src/koffice-1.6.0.tar.bz2
Source100: koshell.png
# stuff for the build configuration
-Patch0: koffice-admin-gcc4isok.patch
+Patch0: koffice-1.6.0.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# BuildRequires: world-devel ;)
-BuildRequires: automake
-BuildRequires: autoconf >= 2.53
BuildRequires: kdebase-devel
BuildRequires: kdelibs-devel
BuildRequires: freetype-devel
BuildRequires: fontconfig-devel
BuildRequires: libart_lgpl-devel
-BuildRequires: libidn-devel
-BuildRequires: gamin-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
BuildRequires: ImageMagick-devel
BuildRequires: bzip2-devel
BuildRequires: zlib-devel
-BuildRequires: libstdc++-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libogg-devel
BuildRequires: openssl-devel
-BuildRequires: esound-devel
-BuildRequires: python-devel
+BuildRequires: python-devel python
BuildRequires: pcre-devel
BuildRequires: libwpd-devel
BuildRequires: lcms-devel
BuildRequires: gettext-devel
BuildRequires: mysql-devel
BuildRequires: desktop-file-utils
-BuildRequires: postgresql-devel
BuildRequires: perl
-BuildRequires: python2-devel
BuildRequires: wv2-devel
BuildRequires: libpqxx-devel
BuildRequires: doxygen
BuildRequires: graphviz-devel
BuildRequires: aspell-devel
-BuildRequires: libacl-devel
BuildRequires: libxslt-devel
BuildRequires: OpenEXR-devel
BuildRequires: libexif-devel
BuildRequires: libGL-devel libGLU-devel
-BuildRequires: libXi-devel
BuildRequires: readline-devel
-BuildRequires: ruby ruby-devel
-
+BuildRequires: ruby ruby-devel >= 1.8.2
+%if "%{?fedora}" > "4"
+BuildRequires: libXi-devel
+%endif
%description
KOffice - Integrated Office Suite
KOffice is a free, integrated office suite for KDE, the K Desktop Environment.
@@ -225,22 +214,23 @@
%prep
%setup -q
-%patch0 -p1
-
-# this will make sure that patch0 is considered
-make -f admin/Makefile.common
+%patch0
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure --disable-rpath --disable-dependency-tracking --enable-shared \
---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} \
---enable-final
+%configure \
+ --disable-rpath --disable-dependency-tracking \
+ --disable-gcc-hidden-visibility \
+ --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
-make
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -265,156 +255,41 @@
#now take care of all the desktop files with desktop-file-utils
#core
desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/KThesaurus.desktop
-
-desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop
-
-#kword
-desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kword.desktop
-
-#kspread
-desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kspread.desktop
-
-#kpresenter
-desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kpresenter.desktop
-
-#karbon
-desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+ --add-category=X-Fedora --vendor="" \
--delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/karbon.desktop
+ $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
-#krita
desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_magick.desktop
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+ --add-category=X-Fedora --vendor="" \
+ $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.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_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
-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
-
-#kchart
-desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kchart.desktop
-
-#kformula
-desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kformula.desktop
-
-#kivio
-desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- --delete-original \
- $RPM_BUILD_ROOT%{_datadir}/applications/kde/kivio.desktop
-
-#kexi
-desktop-file-install \
- --vendor=fedora \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- --delete-original \
- $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
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
%clean
rm -rf $RPM_BUILD_ROOT
-%post core -p /sbin/ldconfig
-%postun core -p /sbin/ldconfig
+%post core
+/sbin/ldconfig
+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 ||:
+update-desktop-database >& /dev/null ||:
+
+%postun core
+/sbin/ldconfig
+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 ||:
+update-desktop-database >& /dev/null ||:
+
%post kword -p /sbin/ldconfig
%postun kword -p /sbin/ldconfig
@@ -496,15 +371,17 @@
%{_libdir}/kde3/libkprkword.*
%{_libdir}/kde3/libthesaurustool.*
%{_libdir}/kde3/clipartthumbnail.*
-%{_datadir}/apps/koffice
+%{_datadir}/apps/koffice/
%{_datadir}/apps/konqueror/servicemenus/*
-%{_datadir}/apps/koshell
-%{_datadir}/apps/thesaurus
+%{_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/*
+%{_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
@@ -518,20 +395,20 @@
%{_datadir}/servicetypes/koplugin.desktop
%{_datadir}/servicetypes/kwmailmerge.desktop
%{_datadir}/servicetypes/widgetfactory.desktop
-%{_datadir}/applications/fedora-KThesaurus.desktop
-%{_datadir}/applications/fedora-koshell.desktop
+%{_datadir}/applications/kde/*KThesaurus.desktop
+%{_datadir}/applications/kde/*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}/apps/kross/
%{_libdir}/kde3/krosspython.*
%{_libdir}/kde3/krossruby.*
%files devel
%{_includedir}/*
-%{_datadir}/doc/HTML/en/koffice-apidocs
-%{_libdir}/*.so
+%{_datadir}/doc/HTML/en/koffice-apidocs/
+%{_libdir}/lib*.so
%files kword
%defattr(-,root,root,-)
@@ -540,13 +417,13 @@
%{_libdir}/libkwordprivate.so.*
%{_libdir}/kde3/libkwordpart.*
%{_libdir}/kde3/kword.*
-%{_datadir}/apps/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/fedora-kword.desktop
+%{_datadir}/applications/kde/*kword.desktop
%files kspread
%defattr(-,root,root,-)
@@ -565,12 +442,14 @@
%{_libdir}/kde3/libopencalcexport.*
%{_libdir}/kde3/libopencalcimport.*
%{_libdir}/kde3/libqproimport.*
-%{_datadir}/apps/kspread
-%{_datadir}/doc/HTML/en/kspread
+%{_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/fedora-kspread.desktop
+%{_datadir}/applications/kde/*kspread.desktop
%files kpresenter
%defattr(-,root,root,-)
@@ -589,12 +468,12 @@
%{_libdir}/kde3/libkpresentersvgexport.*
%{_libdir}/kde3/libkpresenterxbmexport.*
%{_libdir}/kde3/libkpresenterxpmexport.*
-%{_datadir}/apps/kpresenter
-%{_datadir}/doc/HTML/en/kpresenter
+%{_datadir}/apps/kpresenter/
+%{_datadir}/doc/HTML/en/kpresenter/
%{_datadir}/services/kpresenter*.desktop
%{_datadir}/templates/Presentation.desktop
%{_datadir}/templates/.source/Presentation.kpt
-%{_datadir}/applications/fedora-kpresenter.desktop
+%{_datadir}/applications/kde/*kpresenter.desktop
%files karbon
%defattr(-,root,root,-)
@@ -621,11 +500,11 @@
%{_libdir}/kde3/libkarbonxcfexport.*
%{_libdir}/kde3/libwmfexport.*
%{_libdir}/kde3/libwmfimport.*
-%{_datadir}/apps/karbon
+%{_datadir}/apps/karbon/
%{_datadir}/services/karbon*
%{_datadir}/templates/Illustration.desktop
%{_datadir}/templates/.source/Illustration.karbon
-%{_datadir}/applications/fedora-karbon.desktop
+%{_datadir}/applications/kde/*karbon.desktop
%{_datadir}/doc/HTML/en/karbon/
%files krita
@@ -638,6 +517,8 @@
%{_libdir}/libkrita_rgb_f16half.so.*
%{_libdir}/libkrita_rgb_f32.so.*
%{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkrita_ycbcr_u16.so*
+%{_libdir}/libkrita_ycbcr_u8.so*
%{_libdir}/libkritacolor.so.*
%{_libdir}/libkritagrayscale.so.*
%{_libdir}/libkritaimage.so.*
@@ -672,8 +553,6 @@
%{_libdir}/kde3/kritatoolstar.*
%{_libdir}/kde3/kritatooltransform.*
%{_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.*
@@ -691,7 +570,6 @@
%{_libdir}/kde3/kritascripting.*
%{_libdir}/kde3/kritaseparatechannels.*
%{_libdir}/kde3/kritasmalltilesfilter.*
-%{_libdir}/kde3/kritasmearybrush.*
%{_libdir}/kde3/kritasobelfilter.*
%{_libdir}/kde3/kritatoolselectsimilar.*
%{_libdir}/kde3/kritawetplugin.*
@@ -705,12 +583,27 @@
%{_libdir}/kde3/libkritatiffexport.*
%{_libdir}/kde3/libkritatiffimport.*
%{_libdir}/kde3/krosskritacore.*
-%{_datadir}/apps/krita
+%{_libdir}/kde3/krita_ycbcr_u16_plugin.*
+%{_libdir}/kde3/krita_ycbcr_u8_plugin.*
+%{_libdir}/kde3/kritablurfilter.*
+%{_libdir}/kde3/kritaextensioncolorsfilters.*
+%{_libdir}/kde3/kritafastcolortransfer.*
+%{_libdir}/kde3/kritalenscorrectionfilter.*
+%{_libdir}/kde3/kritamodifyselection.*
+%{_libdir}/kde3/kritanoisefilter.*
+%{_libdir}/kde3/kritarandompickfilter.*
+%{_libdir}/kde3/kritasubstrate.*
+%{_libdir}/kde3/kritatoolcurves.*
+%{_libdir}/kde3/kritatoolperspectivegrid.*
+%{_libdir}/kde3/kritatoolperspectivetransform.*
+%{_libdir}/kde3/kritaunsharpfilter.*
+%{_libdir}/kde3/kritawavefilter.*
+%{_datadir}/apps/krita/
%{_datadir}/services/krita*.desktop
%{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/fedora-krita*.desktop
-%{_datadir}/apps/kritaplugins
-%{_datadir}/doc/HTML/en/krita
+%{_datadir}/applications/kde/*krita*.desktop
+%{_datadir}/apps/kritaplugins/
+%{_datadir}/doc/HTML/en/krita/
%{_datadir}/servicetypes/karbon_module.desktop
%files kugar
@@ -725,13 +618,13 @@
%{_libdir}/kde3/kugar.*
%{_libdir}/kde3/libkudesignerpart.*
%{_libdir}/kde3/libkugarpart.*
-%{_datadir}/apps/kudesigner
-%{_datadir}/apps/kugar
-%{_datadir}/doc/HTML/en/kugar
+%{_datadir}/apps/kudesigner/
+%{_datadir}/apps/kugar/
+%{_datadir}/doc/HTML/en/kugar/
%{_datadir}/services/kugar*.desktop
-%{_datadir}/applications/fedora-kugar.desktop
+%{_datadir}/applications/kde/*kugar.desktop
# this not being fedorarized fixes #173086
-%{_datadir}/applnk/Office/kudesigner.desktop
+%{_datadir}/applications/kde/*kudesigner.desktop
%files kexi
%defattr(-,root,root,-)
@@ -773,10 +666,10 @@
%{_datadir}/mimelnk/application/*
%{_datadir}/servicetypes/kexi*.desktop
%{_datadir}/services/kexi
-%{_datadir}/apps/kexi
+%{_datadir}/apps/kexi/
%{_datadir}/services/kformdesigner/*
-%{_datadir}/doc/HTML/en/kexi
-%{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/doc/HTML/en/kexi/
+%{_datadir}/applications/kde/*kexi.desktop
%{_datadir}/services/kexidb_sqlite*driver.desktop
%files kexi-driver-mysql
@@ -808,20 +701,20 @@
%{_libdir}/kde3/libkchartmngexport.*
%{_libdir}/kde3/libkchartxbmexport.*
%{_libdir}/kde3/libkchartxpmexport.*
-%{_datadir}/apps/kchart
+%{_datadir}/apps/kchart/
%{_datadir}/services/kchart*.desktop
-%{_datadir}/doc/HTML/en/kchart
-%{_datadir}/applications/fedora-kchart.desktop
+%{_datadir}/doc/HTML/en/kchart/
+%{_datadir}/applications/kde/*kchart.desktop
%files kformula
%defattr(-,root,root,-)
%{_bindir}/kformula
%{_libdir}/kde3/libkformulapart.*
%{_libdir}/kde3/kformula.*
-%{_datadir}/apps/kformula
-%{_datadir}/doc/HTML/en/kformula
+%{_datadir}/apps/kformula/
+%{_datadir}/doc/HTML/en/kformula/
%{_datadir}/services/kformula*.desktop
-%{_datadir}/applications/fedora-kformula.desktop
+%{_datadir}/applications/kde/*kformula.desktop
%files kivio
%defattr(-,root,root,-)
@@ -837,11 +730,11 @@
%{_libdir}/kde3/libkiviotargettool.*
%{_libdir}/kde3/libkiviotexttool.*
%{_libdir}/kde3/libkiviozoomtool.*
-%{_datadir}/apps/kivio
+%{_datadir}/apps/kivio/
%{_datadir}/config.kcfg/kivio.kcfg
-%{_datadir}/doc/HTML/en/kivio
+%{_datadir}/doc/HTML/en/kivio/
%{_datadir}/services/kivio*.desktop
-%{_datadir}/applications/fedora-kivio.desktop
+%{_datadir}/applications/kde/*kivio.desktop
%files filters
%defattr(-,root,root,-)
@@ -890,11 +783,13 @@
%{_libdir}/kde3/libhancomwordimport.*
%{_libdir}/kde3/libkfosvgexport.*
%{_libdir}/kde3/liboodrawimport.*
-%{_libdir}/kde3/libpowerpointimport.*
-%{_datadir}/apps/xsltfilter
+%{_libdir}/kde3/libkspreadkexiimport.*
+%{_libdir}/kde3/libolefilter.*
+%{_datadir}/apps/xsltfilter/
%{_datadir}/services/generic_filter.desktop
%{_datadir}/services/xslt*.desktop
%{_datadir}/servicetypes/kofilter*.desktop
+%{_datadir}/services/ole_powerpoint97_import.desktop
%files kplato
%defattr(-,root,root,-)
@@ -902,12 +797,17 @@
%{_libdir}/libkdeinit_kplato.so
%{_libdir}/kde3/kplato.*
%{_libdir}/kde3/libkplatopart.*
-%{_datadir}/apps/kplato
-%{_datadir}/doc/HTML/en/kplato
+%{_datadir}/apps/kplato/
+%{_datadir}/doc/HTML/en/kplato/
%{_datadir}/services/kplatopart.desktop
-%{_datadir}/applications/fedora-kplato.desktop
+%{_datadir}/applications/kde/*kplato.desktop
%changelog
+* Wed Oct 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.6.0-1
+- version upgrade
+- merge with rexe's edition of the devel spec (thanks again)
+
* Wed Aug 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
1.5.2-1
- version upgrade
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 3 Aug 2006 09:15:25 -0000 1.12
+++ sources 21 Oct 2006 07:51:58 -0000 1.13
@@ -1 +1 @@
-cbe9deeb7c811a6bb5a954989b25c1f2 koffice-1.5.2.tar.bz2
+e669cf19b2e1c7db7029c0772c527c0d koffice-1.6.0.tar.bz2
--- koffice-admin-gcc4isok.patch DELETED ---
- Previous message (by thread): rpms/koffice/FC-4 koffice-1.6.0.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 koffice.spec, 1.17, 1.18 sources, 1.9, 1.10 koffice-admin-gcc4isok.patch, 1.1, NONE koffice-kexi-version.patch, 1.1, NONE
- Next message (by thread): rpms/wine/FC-3 .cvsignore, 1.19, 1.20 sources, 1.20, 1.21 wine.spec, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list