rpms/koffice/devel .cvsignore, 1.17, 1.18 koffice.spec, 1.74, 1.75 sources, 1.17, 1.18
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Jul 17 05:24:10 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21207
Modified Files:
.cvsignore koffice.spec sources
Log Message:
* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.9-1
- koffice-1.9.95.9
- fix pkg interdependencies, multilib issues
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 27 May 2008 20:56:46 -0000 1.17
+++ .cvsignore 17 Jul 2008 05:23:10 -0000 1.18
@@ -1 +1 @@
-koffice-1.9.95.8.tar.bz2
+koffice-1.9.95.9.tar.bz2
Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- koffice.spec 27 Jun 2008 17:53:50 -0000 1.74
+++ koffice.spec 17 Jul 2008 05:23:10 -0000 1.75
@@ -1,7 +1,7 @@
Name: koffice
-Version: 1.9.95.8
-Release: 2%{?dist}
+Version: 1.9.95.9
+Release: 1%{?dist}
Summary: An integrated office suite
Group: Applications/Productivity
@@ -17,9 +17,7 @@
#+ 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
@@ -33,6 +31,7 @@
BuildRequires: freetype-devel
BuildRequires: gettext-devel
BuildRequires: giflib-devel
+BuildRequires: glew-devel
BuildRequires: GraphicsMagick-devel
BuildRequires: gsl-devel
BuildRequires: kdelibs4-devel
@@ -90,6 +89,8 @@
Group: Applications/Productivity
Requires: %{name}-libs = %{version}-%{release}
#Conflicts: koffice-i18n < 4:%{version}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
%description core
%{summary}.
@@ -238,8 +239,7 @@
%{cmake_kde4} ..
popd
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
-
+make %{?_smp_mflags} -C %{_target_platform}
%install
@@ -251,6 +251,12 @@
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}/libkarbon*.so
+rm -f %{buildroot}%{_kde4_libdir}/libkexi*.so
+rm -f %{buildroot}%{_kde4_libdir}/libkisexiv2.so
+rm -f %{buildroot}%{_kde4_libdir}/libkformdesigner.so
+rm -f %{buildroot}%{_kde4_libdir}/libkplato*.so
+rm -f %{buildroot}%{_kde4_libdir}/libkword*.so
rm -f %{buildroot}%{_kde4_libdir}/libkrita*.so
rm -f %{buildroot}%{_kde4_libdir}/libkross*.so
@@ -260,14 +266,14 @@
%post core
-touch --no-create %{_kde4_datadir}/icons/hicolor || :
-gtk-update-icon-cache -q %{_kde4_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
%postun core
-touch --no-create %{_kde4_datadir}/icons/hicolor || :
-gtk-update-icon-cache -q %{_kde4_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
%post kword -p /sbin/ldconfig
%postun kword -p /sbin/ldconfig
@@ -312,8 +318,6 @@
%{_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/
@@ -322,6 +326,7 @@
%{_kde4_docdir}/HTML/en/thesaurus/
%{_kde4_datadir}/applications/kde4/KThesaurus.desktop
%{_kde4_datadir}/icons/hicolor/*/*/*
+%{_kde4_datadir}/icons/oxygen/*/*/*
%{_kde4_datadir}/kde4/services/autocorrect.desktop
%{_kde4_datadir}/kde4/services/changecase.desktop
%{_kde4_datadir}/kde4/services/clipartthumbnail.desktop
@@ -361,6 +366,8 @@
%{_kde4_datadir}/kde4/servicetypes/flake*.desktop
%{_kde4_libdir}/libflake.so.*
%{_kde4_libdir}/kde4/*shape.so
+%exclude %{_kde4_libdir}/kde4/formulashape.*
+%exclude %{_kde4_libdir}/kde4/kritashape.*
%{_kde4_libdir}/libchartshapelib.so.*
%{_kde4_libdir}/libkdchart.so.*
%{_kde4_libdir}/libkochart.so.*
@@ -374,6 +381,7 @@
%{_kde4_libdir}/libkoresources.so.*
%{_kde4_libdir}/libkoffice_graya_u16.so.*
%{_kde4_libdir}/libkofficegrayau8colorspace.so.*
+%{_kde4_libdir}/libkspreadcommon.so.*
%{_kde4_libdir}/libkstore.so.*
%{_kde4_libdir}/libkwmf.so.*
%{_kde4_libdir}/libkformulalib.so.*
@@ -383,6 +391,7 @@
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
+# FIXME: include only shlib symlinks we know/want to export
%{_kde4_libdir}/lib*.so
%exclude %{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_appsdir}/cmake/modules/FindKOfficeLibs.cmake
@@ -391,8 +400,8 @@
%defattr(-,root,root,-)
%{_kde4_bindir}/kspread
%{_kde4_libdir}/libkdeinit4_kspread.so
-%{_kde4_libdir}/libkspreadcommon.so.*
%{_kde4_libdir}/kde4/krossmodulekspread.so
+%{_kde4_libdir}/kde4/kspread*.so
%{_kde4_libdir}/kde4/libkspreadpart.*
%{_kde4_libdir}/kde4/libcsvexport.*
%{_kde4_libdir}/kde4/libcsvimport.*
@@ -403,6 +412,7 @@
%{_kde4_libdir}/kde4/libkspreadsolver.so
%{_kde4_libdir}/kde4/libopencalcexport.*
%{_kde4_libdir}/kde4/libopencalcimport.*
+%{_kde4_libdir}/kde4/libpowerpointimport.*
%{_kde4_libdir}/kde4/libqproimport.*
%{_kde4_appsdir}/kspread/
%{_kde4_docdir}/HTML/en/kspread/
@@ -413,6 +423,7 @@
%{_kde4_datadir}/applications/kde4/*kspread.desktop
%{_kde4_datadir}/kde4/services/ServiceMenus/kspread_konqi.desktop
%{_kde4_datadir}/kde4/services/krossmodulekspread.desktop
+%{_kde4_datadir}/kde4/servicetypes/kspread_plugin.desktop
%files kpresenter
%defattr(-,root,root,-)
@@ -421,13 +432,17 @@
%{_kde4_libdir}/libkpresenterprivate.so.*
%{_kde4_libdir}/kde4/*kpresenter*.*
%{_kde4_libdir}/kde4/kpr_*.*
+%{_kde4_libdir}/kde4/libFilterkpr2odf.so
%{_kde4_appsdir}/kpresenter/
%{_kde4_docdir}/HTML/en/kpresenter/
%{_kde4_datadir}/kde4/services/kpr*.desktop
%{_kde4_datadir}/kde4/servicetypes/kpr*.desktop
+%{_kde4_datadir}/kde4/servicetypes/presentationeventaction.desktop
+%{_kde4_datadir}/kde4/servicetypes/scripteventaction.desktop
%{_kde4_datadir}/templates/Presentation.desktop
%{_kde4_datadir}/templates/.source/Presentation.kpt
%{_kde4_datadir}/applications/kde4/*kpresenter.desktop
+%{_kde4_datadir}/kde4/services/Filterkpr2odf.desktop
%{_kde4_datadir}/kde4/services/ServiceMenus/kpresenter_konqi.desktop
%files karbon
@@ -481,6 +496,7 @@
%{_kde4_libdir}/kde4/kexidb_sqlite3driver.*
%{_kde4_libdir}/kde4/kexihandler_*.*
%{_kde4_libdir}/kde4/krossmodulekexidb.so
+%{_kde4_libdir}/kde4/pgzkexireportpart2.so
%{_kde4_datadir}/config/kexirc
%{_kde4_datadir}/kde4/servicetypes/kexi*.desktop
%{_kde4_datadir}/kde4/services/kexi
@@ -524,6 +540,7 @@
%{_kde4_libdir}/libkdeinit4_kformula.so
%{_kde4_libdir}/libkformulaprivate.so.*
%{_kde4_libdir}/kde4/*kformula*.*
+%{_kde4_libdir}/kde4/formulashape.*
%{_kde4_appsdir}/kformula/
%{_kde4_docdir}/HTML/en/kformula/
%{_kde4_datadir}/kde4/services/kformula*.desktop
@@ -574,6 +591,7 @@
%{_kde4_libdir}/kde4/libwpexport.*
%{_kde4_libdir}/kde4/libwpimport.*
%{_kde4_libdir}/kde4/libmswordimport.*
+%{_kde4_libdir}/kde4/libmswordodf_import.*
%{_kde4_libdir}/kde4/libxsltimport.*
%{_kde4_libdir}/kde4/libxsltexport.*
%{_kde4_libdir}/kde4/libhancomwordimport.*
@@ -586,6 +604,7 @@
%defattr(-,root,root,-)
%{_kde4_bindir}/kplato
%{_kde4_bindir}/kplatowork
+%{_kde4_configdir}/kplatorc
%{_kde4_libdir}/libkdeinit4_kplato.so
%{_kde4_libdir}/libkdeinit4_kplatowork.so
%{_kde4_libdir}/kde4/libkplatopart.*
@@ -616,7 +635,11 @@
%{_kde4_datadir}/kde4/services/ServiceMenus/kword_konqi.desktop
%changelog
-* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95-8.2
+* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.9-1
+- koffice-1.9.95.9
+- fix pkg interdependencies, multilib issues
+
+* Fri Jun 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8.2
- respin (eviv2)
* Tue May 27 2008 Rex Dieter <rdieter at fedoraproject.org> 1.9.95.8-1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 27 May 2008 20:56:46 -0000 1.17
+++ sources 17 Jul 2008 05:23:10 -0000 1.18
@@ -1 +1 @@
-6543af9edb3ac2cd573eec95c59e065f koffice-1.9.95.8.tar.bz2
+8686ff53789c093284543ed5348b012d koffice-1.9.95.9.tar.bz2
More information about the fedora-extras-commits
mailing list