[calligra] 2.9.0
Rex Dieter
rdieter at fedoraproject.org
Fri Feb 27 03:15:19 UTC 2015
commit 28bd7a94cd149b186d195c7dbcd2e9357498c676
Author: Rex Dieter <rdieter at gmail.com>
Date: Thu Feb 26 21:15:16 2015 -0600
2.9.0
.gitignore | 2 +-
...a-Okular-plugins-be-less-aggressively-go-.patch | 90 +++
...-installation-location-of-app-desktop-fil.patch | 490 ++++++++++++
calligra-2.7.90-no_mpxj.patch | 11 -
calligra-2.8.6-librevenge.patch | 818 ---------------------
calligra-2.9.0-disable_products.patch | 15 +
calligra-eigen3.patch | 298 --------
calligra.spec | 303 ++++----
sources | 2 +-
9 files changed, 773 insertions(+), 1256 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2900bb8..bb7f835 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/calligra-2.8.7.tar.xz
+/calligra-2.9.0.tar.xz
diff --git a/0001-Let-Calligra-Okular-plugins-be-less-aggressively-go-.patch b/0001-Let-Calligra-Okular-plugins-be-less-aggressively-go-.patch
new file mode 100644
index 0000000..d5eea8c
--- /dev/null
+++ b/0001-Let-Calligra-Okular-plugins-be-less-aggressively-go-.patch
@@ -0,0 +1,90 @@
+From 737e3d326068d9001da4ec7cdf9caa34951c42e5 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau at kde.org>
+Date: Wed, 25 Feb 2015 20:09:43 +0100
+Subject: [PATCH 1/2] Let Calligra Okular plugins be less aggressively go for
+ being file handler
+
+---
+ extras/okularodpgenerator/okularApplication_odp.desktop | 2 +-
+ extras/okularodtgenerator/okularApplication_odt.desktop | 2 +-
+ filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop | 2 +-
+ filters/stage/pptx/okularApplication_pptx_calligra.desktop | 2 +-
+ filters/words/docx/import/okularApplication_docx_calligra.desktop | 2 +-
+ filters/words/msword-odf/okularApplication_doc_calligra.desktop | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/extras/okularodpgenerator/okularApplication_odp.desktop b/extras/okularodpgenerator/okularApplication_odp.desktop
+index 9331a9f..eb83723 100644
+--- a/extras/okularodpgenerator/okularApplication_odp.desktop
++++ b/extras/okularodpgenerator/okularApplication_odp.desktop
+@@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器
+ Exec=okular %U %i -caption %c
+ Icon=okular
+ Type=Application
+-InitialPreference=7
++InitialPreference=3
+ Categories=Qt;KDE;Graphics;Viewer;
+ NoDisplay=true
+diff --git a/extras/okularodtgenerator/okularApplication_odt.desktop b/extras/okularodtgenerator/okularApplication_odt.desktop
+index 5cf6a5e..32cd785 100644
+--- a/extras/okularodtgenerator/okularApplication_odt.desktop
++++ b/extras/okularodtgenerator/okularApplication_odt.desktop
+@@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器
+ Exec=okular %U %i -caption %c
+ Icon=okular
+ Type=Application
+-InitialPreference=7
++InitialPreference=3
+ Categories=Qt;KDE;Graphics;Viewer;
+ NoDisplay=true
+diff --git a/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop b/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop
+index e4f86b1..6697d75 100644
+--- a/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop
++++ b/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop
+@@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器
+ Exec=okular %U %i -caption %c
+ Icon=okular
+ Type=Application
+-InitialPreference=7
++InitialPreference=3
+ Categories=Qt;KDE;Graphics;Viewer;
+ NoDisplay=true
+diff --git a/filters/stage/pptx/okularApplication_pptx_calligra.desktop b/filters/stage/pptx/okularApplication_pptx_calligra.desktop
+index ab49821..ffe6c21 100644
+--- a/filters/stage/pptx/okularApplication_pptx_calligra.desktop
++++ b/filters/stage/pptx/okularApplication_pptx_calligra.desktop
+@@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器
+ Exec=okular %U %i -caption %c
+ Icon=okular
+ Type=Application
+-InitialPreference=7
++InitialPreference=3
+ Categories=Qt;KDE;Graphics;Viewer;
+ NoDisplay=true
+diff --git a/filters/words/docx/import/okularApplication_docx_calligra.desktop b/filters/words/docx/import/okularApplication_docx_calligra.desktop
+index 9f0e477..baa69e5 100644
+--- a/filters/words/docx/import/okularApplication_docx_calligra.desktop
++++ b/filters/words/docx/import/okularApplication_docx_calligra.desktop
+@@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器
+ Exec=okular %U %i -caption %c
+ Icon=okular
+ Type=Application
+-InitialPreference=7
++InitialPreference=3
+ Categories=Qt;KDE;Graphics;Viewer;
+ NoDisplay=true
+diff --git a/filters/words/msword-odf/okularApplication_doc_calligra.desktop b/filters/words/msword-odf/okularApplication_doc_calligra.desktop
+index 3ee20a8..f93c2b2 100644
+--- a/filters/words/msword-odf/okularApplication_doc_calligra.desktop
++++ b/filters/words/msword-odf/okularApplication_doc_calligra.desktop
+@@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器
+ Exec=okular %U %i -caption %c
+ Icon=okular
+ Type=Application
+-InitialPreference=7
++InitialPreference=3
+ Categories=Qt;KDE;Graphics;Viewer;
+ NoDisplay=true
+--
+2.1.0
+
diff --git a/0002-Restore-old-installation-location-of-app-desktop-fil.patch b/0002-Restore-old-installation-location-of-app-desktop-fil.patch
new file mode 100644
index 0000000..1fd9770
--- /dev/null
+++ b/0002-Restore-old-installation-location-of-app-desktop-fil.patch
@@ -0,0 +1,490 @@
+From 6908abb9610cc2faf4014ea012c4db5706655463 Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau at kde.org>
+Date: Thu, 26 Feb 2015 23:25:05 +0100
+Subject: [PATCH 2/2] Restore old installation location of app desktop files
+
+Needed because the id of desktop files is generated from the relative path
+to the respective $XDG_DATA_DIRS/application, and by having changed the
+install location the id will be a different, so anything using the id,
+like bookmars/shortcuts, will suddenly fail.
+
+See http://specs.freedesktop.org/menu-spec/menu-spec-latest.html#term-desktop-file-id
+
+Partially reverts 5236815e940fc090279eee01eb34ed355349b4b4
+---
+ active/CMakeLists.txt | 2 +-
+ braindump/data/CMakeLists.txt | 2 +-
+ doc/CMakeLists.txt | 2 +-
+ filters/stage/powerpoint/CMakeLists.txt | 2 +-
+ filters/stage/pptx/CMakeLists.txt | 2 +-
+ filters/words/ascii/CMakeLists.txt | 2 +-
+ filters/words/docx/import/CMakeLists.txt | 2 +-
+ filters/words/msword-odf/CMakeLists.txt | 2 +-
+ filters/words/wordperfect/import/CMakeLists.txt | 2 +-
+ flow/part/CMakeLists.txt | 2 +-
+ karbon/data/CMakeLists.txt | 2 +-
+ kexi/CMakeLists.txt | 2 +-
+ krita/CMakeLists.txt | 2 +-
+ krita/gemini/CMakeLists.txt | 2 +-
+ krita/plugins/formats/bmp/CMakeLists.txt | 2 +-
+ krita/plugins/formats/eps/CMakeLists.txt | 2 +-
+ krita/plugins/formats/exr/CMakeLists.txt | 2 +-
+ krita/plugins/formats/heightmap/CMakeLists.txt | 2 +-
+ krita/plugins/formats/jp2/CMakeLists.txt | 2 +-
+ krita/plugins/formats/jpeg/CMakeLists.txt | 2 +-
+ krita/plugins/formats/odg/CMakeLists.txt | 2 +-
+ krita/plugins/formats/oiio/CMakeLists.txt | 4 ++--
+ krita/plugins/formats/ora/CMakeLists.txt | 2 +-
+ krita/plugins/formats/pdf/CMakeLists.txt | 2 +-
+ krita/plugins/formats/png/CMakeLists.txt | 2 +-
+ krita/plugins/formats/ppm/CMakeLists.txt | 2 +-
+ krita/plugins/formats/psd/CMakeLists.txt | 2 +-
+ krita/plugins/formats/raw/CMakeLists.txt | 2 +-
+ krita/plugins/formats/tga/CMakeLists.txt | 2 +-
+ krita/plugins/formats/tiff/CMakeLists.txt | 2 +-
+ krita/plugins/formats/xcf/CMakeLists.txt | 2 +-
+ krita/sketch/CMakeLists.txt | 2 +-
+ plan/CMakeLists.txt | 2 +-
+ plan/workpackage/CMakeLists.txt | 2 +-
+ sheets/CMakeLists.txt | 2 +-
+ stage/app/CMakeLists.txt | 2 +-
+ words/app/CMakeLists.txt | 2 +-
+ words/part/CMakeLists.txt | 2 +-
+ 38 files changed, 39 insertions(+), 39 deletions(-)
+
+diff --git a/active/CMakeLists.txt b/active/CMakeLists.txt
+index a2fe0da..881e203 100644
+--- a/active/CMakeLists.txt
++++ b/active/CMakeLists.txt
+@@ -68,5 +68,5 @@ endif( SHOULD_BUILD_FEATURE_RDF )
+
+
+ install(TARGETS calligraactive RUNTIME DESTINATION bin)
+-install(FILES calligraactive.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install(FILES calligraactive.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install(DIRECTORY qml DESTINATION share/calligraactive)
+diff --git a/braindump/data/CMakeLists.txt b/braindump/data/CMakeLists.txt
+index f5df58e..b67d164 100644
+--- a/braindump/data/CMakeLists.txt
++++ b/braindump/data/CMakeLists.txt
+@@ -12,5 +12,5 @@ install( FILES braindumpui.rc braindumpview.rc DESTINATION ${DATA_INSTALL_DIR}/b
+ install( FILES import/zoom-pixels.png DESTINATION ${DATA_INSTALL_DIR}/braindump/icons/hicolor/22x22/actions)
+
+ ### desktop files ###
+-install( PROGRAMS braindump.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS braindump.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install( FILES braindump.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 91c8d20..0b4e238 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -8,4 +8,4 @@ endif(SHOULD_BUILD_STAGE)
+ if(SHOULD_BUILD_SHEETS)
+ add_subdirectory(sheets)
+ endif(SHOULD_BUILD_SHEETS)
+-INSTALL(FILES calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++INSTALL(FILES calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/filters/stage/powerpoint/CMakeLists.txt b/filters/stage/powerpoint/CMakeLists.txt
+index 53743fc..d569d8d 100644
+--- a/filters/stage/powerpoint/CMakeLists.txt
++++ b/filters/stage/powerpoint/CMakeLists.txt
+@@ -31,5 +31,5 @@ endif(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
+
+ if(SHOULD_BUILD_OKULARGENERATOR_PPT)
+ install( FILES libokularGenerator_powerpoint_calligra.desktop okularPowerpoint_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra )
+- install( PROGRAMS okularApplication_powerpoint_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra )
++ install( PROGRAMS okularApplication_powerpoint_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+ endif(SHOULD_BUILD_OKULARGENERATOR_PPT)
+diff --git a/filters/stage/pptx/CMakeLists.txt b/filters/stage/pptx/CMakeLists.txt
+index 36434f9..b48615c 100644
+--- a/filters/stage/pptx/CMakeLists.txt
++++ b/filters/stage/pptx/CMakeLists.txt
+@@ -45,5 +45,5 @@ endif(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
+
+ if(SHOULD_BUILD_OKULARGENERATOR_PPTX)
+ install( FILES libokularGenerator_pptx_calligra.desktop okularPptx_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra )
+- install( PROGRAMS okularApplication_pptx_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra )
++ install( PROGRAMS okularApplication_pptx_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+ endif(SHOULD_BUILD_OKULARGENERATOR_PPTX)
+diff --git a/filters/words/ascii/CMakeLists.txt b/filters/words/ascii/CMakeLists.txt
+index ae4eac3..45de65e 100644
+--- a/filters/words/ascii/CMakeLists.txt
++++ b/filters/words/ascii/CMakeLists.txt
+@@ -37,7 +37,7 @@ install(TARGETS calligra_filter_odt2ascii DESTINATION ${PLUGIN_INSTALL_DIR})
+ install( FILES calligra_filter_odt2ascii.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+
+
+-install( PROGRAMS calligrawords_ascii.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS calligrawords_ascii.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+
+ endif(SHOULD_BUILD_FILTER_ODT_TO_ASCII)
+
+diff --git a/filters/words/docx/import/CMakeLists.txt b/filters/words/docx/import/CMakeLists.txt
+index 70490d4..70edffb 100644
+--- a/filters/words/docx/import/CMakeLists.txt
++++ b/filters/words/docx/import/CMakeLists.txt
+@@ -75,5 +75,5 @@ endif(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
+
+ if(SHOULD_BUILD_OKULAR_GENERATOR_DOCX)
+ install( FILES libokularGenerator_docx_calligra.desktop okularDocx_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra )
+- install( PROGRAMS okularApplication_docx_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra )
++ install( PROGRAMS okularApplication_docx_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+ endif(SHOULD_BUILD_OKULAR_GENERATOR_DOCX)
+diff --git a/filters/words/msword-odf/CMakeLists.txt b/filters/words/msword-odf/CMakeLists.txt
+index 2b975a1..36a35f4 100644
+--- a/filters/words/msword-odf/CMakeLists.txt
++++ b/filters/words/msword-odf/CMakeLists.txt
+@@ -37,5 +37,5 @@ endif(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
+
+ if(SHOULD_BUILD_OKULAR_GENERATOR_DOC)
+ install( FILES libokularGenerator_doc_calligra.desktop okularDoc_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra )
+- install( PROGRAMS okularApplication_doc_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra )
++ install( PROGRAMS okularApplication_doc_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+ endif(SHOULD_BUILD_OKULAR_GENERATOR_DOC)
+diff --git a/filters/words/wordperfect/import/CMakeLists.txt b/filters/words/wordperfect/import/CMakeLists.txt
+index a9d034b..219ee4c 100644
+--- a/filters/words/wordperfect/import/CMakeLists.txt
++++ b/filters/words/wordperfect/import/CMakeLists.txt
+@@ -29,5 +29,5 @@ endif(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
+
+ if(SHOULD_BUILD_OKULAR_GENERATOR_WORDPERFECT)
+ install( FILES libokularGenerator_wpd_calligra.desktop okularWpd_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra )
+- install( PROGRAMS okularApplication_wpd_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra )
++ install( PROGRAMS okularApplication_wpd_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+ endif(SHOULD_BUILD_OKULAR_GENERATOR_WORDPERFECT)
+diff --git a/flow/part/CMakeLists.txt b/flow/part/CMakeLists.txt
+index 6a02497..58882f1 100644
+--- a/flow/part/CMakeLists.txt
++++ b/flow/part/CMakeLists.txt
+@@ -48,7 +48,7 @@ install(TARGETS calligraflow ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ### desktop files ###
+ install( FILES flowpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS flow.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS flow.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install( FILES flow.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+
+ ### GUI files ###
+diff --git a/karbon/data/CMakeLists.txt b/karbon/data/CMakeLists.txt
+index 009fb37..a3777e4 100644
+--- a/karbon/data/CMakeLists.txt
++++ b/karbon/data/CMakeLists.txt
+@@ -4,6 +4,6 @@ install( FILES karbon_viewplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DI
+ install( FILES karbon_dock.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+ install( FILES karbonpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+ install( FILES karbon.rc karbon_readonly.rc DESTINATION ${DATA_INSTALL_DIR}/karbon)
+-install( PROGRAMS karbon.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS karbon.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install( FILES karbon.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+ install( FILES karbonrc DESTINATION ${CONFIG_INSTALL_DIR} )
+diff --git a/kexi/CMakeLists.txt b/kexi/CMakeLists.txt
+index 4ad17e5..8058667 100644
+--- a/kexi/CMakeLists.txt
++++ b/kexi/CMakeLists.txt
+@@ -100,7 +100,7 @@ ENDIF(KEXI_MOBILE)
+
+ ########### install files ###############
+
+-install(PROGRAMS kexi.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install(PROGRAMS kexi.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install(FILES kexi.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+
+ #kde4_create_doxygen_docs( EXCLUDE 3rdparty kexidb/parser/sqlparser.h kexidb/drivers/odbc )
+diff --git a/krita/CMakeLists.txt b/krita/CMakeLists.txt
+index dc25e2b..26f1a2c 100644
+--- a/krita/CMakeLists.txt
++++ b/krita/CMakeLists.txt
+@@ -163,7 +163,7 @@ if (Q_WS_MAC)
+ endif (Q_WS_MAC)
+
+ install(TARGETS krita ${INSTALL_TARGETS_DEFAULT_ARGS})
+-install(PROGRAMS krita.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install(PROGRAMS krita.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install(FILES krita.rc DESTINATION ${DATA_INSTALL_DIR}/krita)
+ install(FILES krita.action DESTINATION ${DATA_INSTALL_DIR}/krita/actions)
+ install(FILES krita.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/ )
+diff --git a/krita/gemini/CMakeLists.txt b/krita/gemini/CMakeLists.txt
+index 40bdd15..fda9c18 100644
+--- a/krita/gemini/CMakeLists.txt
++++ b/krita/gemini/CMakeLists.txt
+@@ -42,7 +42,7 @@ target_link_libraries(kritagemini
+ )
+
+ install(TARGETS kritagemini ${INSTALL_TARGETS_DEFAULT_ARGS})
+-install(PROGRAMS kritagemini.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install(PROGRAMS kritagemini.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install(FILES kritageminirc kritageminipanelsrc DESTINATION ${CONFIG_INSTALL_DIR} )
+ install(FILES kritagemini.qml DESTINATION ${DATA_INSTALL_DIR}/kritagemini)
+ install(FILES kritagemini.rc DESTINATION ${DATA_INSTALL_DIR}/kritagemini)
+diff --git a/krita/plugins/formats/bmp/CMakeLists.txt b/krita/plugins/formats/bmp/CMakeLists.txt
+index 429d34b..c2bff3f 100644
+--- a/krita/plugins/formats/bmp/CMakeLists.txt
++++ b/krita/plugins/formats/bmp/CMakeLists.txt
+@@ -24,4 +24,4 @@ target_link_libraries(kritabmpimport kritaui)
+ install(TARGETS kritabmpimport DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ install( FILES krita_bmp_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_bmp.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_bmp.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/eps/CMakeLists.txt b/krita/plugins/formats/eps/CMakeLists.txt
+index aae923b..2c394dd 100644
+--- a/krita/plugins/formats/eps/CMakeLists.txt
++++ b/krita/plugins/formats/eps/CMakeLists.txt
+@@ -37,4 +37,4 @@ install(TARGETS kritaepsexport DESTINATION ${PLUGIN_INSTALL_DIR})
+ ########### install files ###############
+
+ install( FILES krita_eps_import.desktop krita_eps_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_eps.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_eps.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/exr/CMakeLists.txt b/krita/plugins/formats/exr/CMakeLists.txt
+index 67b905a..e3c7fbb 100644
+--- a/krita/plugins/formats/exr/CMakeLists.txt
++++ b/krita/plugins/formats/exr/CMakeLists.txt
+@@ -47,4 +47,4 @@ install( FILES
+ DESTINATION ${DATA_INSTALL_DIR}/krita/metadata/schemas)
+
+ install( FILES krita_exr_import.desktop krita_exr_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_exr.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_exr.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/heightmap/CMakeLists.txt b/krita/plugins/formats/heightmap/CMakeLists.txt
+index bae2605..0f1a7a6 100644
+--- a/krita/plugins/formats/heightmap/CMakeLists.txt
++++ b/krita/plugins/formats/heightmap/CMakeLists.txt
+@@ -29,4 +29,4 @@ install(TARGETS kritaheightmapexport DESTINATION ${PLUGIN_INSTALL_DIR})
+ ########### install files ###############
+
+ install( FILES krita_heightmap_import.desktop krita_heightmap_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_heightmap.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_heightmap.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/jp2/CMakeLists.txt b/krita/plugins/formats/jp2/CMakeLists.txt
+index d64330b..4ed2d65 100644
+--- a/krita/plugins/formats/jp2/CMakeLists.txt
++++ b/krita/plugins/formats/jp2/CMakeLists.txt
+@@ -38,4 +38,4 @@ install(TARGETS kritajp2export DESTINATION ${PLUGIN_INSTALL_DIR})
+ ########### install files ###############
+
+ install( FILES krita_jp2_import.desktop krita_jp2_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_jp2.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_jp2.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/jpeg/CMakeLists.txt b/krita/plugins/formats/jpeg/CMakeLists.txt
+index 8403024..d20c631 100644
+--- a/krita/plugins/formats/jpeg/CMakeLists.txt
++++ b/krita/plugins/formats/jpeg/CMakeLists.txt
+@@ -51,4 +51,4 @@ install(TARGETS kritajpegexport DESTINATION ${PLUGIN_INSTALL_DIR})
+ ########### install files ###############
+
+ install( FILES krita_jpeg_import.desktop krita_jpeg_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_jpeg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_jpeg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/odg/CMakeLists.txt b/krita/plugins/formats/odg/CMakeLists.txt
+index af3bba5..6952786 100644
+--- a/krita/plugins/formats/odg/CMakeLists.txt
++++ b/krita/plugins/formats/odg/CMakeLists.txt
+@@ -16,4 +16,4 @@ target_link_libraries(kritaodgimport kritaui ${PNG_LIBRARIES} )
+ install(TARGETS kritaodgimport DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ install( FILES krita_odg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_odg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_odg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/oiio/CMakeLists.txt b/krita/plugins/formats/oiio/CMakeLists.txt
+index 6714081..3f95822 100644
+--- a/krita/plugins/formats/oiio/CMakeLists.txt
++++ b/krita/plugins/formats/oiio/CMakeLists.txt
+@@ -11,7 +11,7 @@ target_link_libraries(kritaoiioexport kritaui ${OIIO_LIBRARIES})
+ install(TARGETS kritaoiioexport DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ install( FILES krita_oiio_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_oiio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_oiio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+
+ set(kritaoiioimport_PART_SRCS
+ kis_oiio_import.cpp
+@@ -26,4 +26,4 @@ target_link_libraries(kritaoiioimport kritaui ${OIIO_LIBRARIES})
+ install(TARGETS kritaoiioimport DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ install( FILES krita_oiio_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_oiio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_oiio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/ora/CMakeLists.txt b/krita/plugins/formats/ora/CMakeLists.txt
+index e36af88..430294c 100644
+--- a/krita/plugins/formats/ora/CMakeLists.txt
++++ b/krita/plugins/formats/ora/CMakeLists.txt
+@@ -34,7 +34,7 @@ install(TARGETS kritaoraexport DESTINATION ${PLUGIN_INSTALL_DIR})
+ ########### install files ###############
+
+ install( FILES krita_ora_import.desktop krita_ora_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_ora.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_ora.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+
+ if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
+ install( FILES krita_ora_thumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+diff --git a/krita/plugins/formats/pdf/CMakeLists.txt b/krita/plugins/formats/pdf/CMakeLists.txt
+index b2b0ea3..f980887 100644
+--- a/krita/plugins/formats/pdf/CMakeLists.txt
++++ b/krita/plugins/formats/pdf/CMakeLists.txt
+@@ -17,4 +17,4 @@ install(TARGETS kritapdfimport DESTINATION ${PLUGIN_INSTALL_DIR})
+ ########### install files ###############
+
+ install( FILES krita_pdf_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_pdf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_pdf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/png/CMakeLists.txt b/krita/plugins/formats/png/CMakeLists.txt
+index 4fdddbf..9f98858 100644
+--- a/krita/plugins/formats/png/CMakeLists.txt
++++ b/krita/plugins/formats/png/CMakeLists.txt
+@@ -34,4 +34,4 @@ target_link_libraries(kritapngexport kritaui ${PNG_LIBRARIES})
+ install(TARGETS kritapngexport DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ install( FILES krita_png_import.desktop krita_png_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_png.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_png.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/ppm/CMakeLists.txt b/krita/plugins/formats/ppm/CMakeLists.txt
+index 21cbfa2..fe5dd46 100644
+--- a/krita/plugins/formats/ppm/CMakeLists.txt
++++ b/krita/plugins/formats/ppm/CMakeLists.txt
+@@ -29,4 +29,4 @@ install(TARGETS kritappmexport DESTINATION ${PLUGIN_INSTALL_DIR})
+ ########### install files ###############
+
+ install( FILES krita_ppm_import.desktop krita_ppm_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_ppm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_ppm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/psd/CMakeLists.txt b/krita/plugins/formats/psd/CMakeLists.txt
+index 05e808a..451560c 100644
+--- a/krita/plugins/formats/psd/CMakeLists.txt
++++ b/krita/plugins/formats/psd/CMakeLists.txt
+@@ -54,4 +54,4 @@ install(TARGETS kritapsdexport DESTINATION ${PLUGIN_INSTALL_DIR})
+ install( FILES krita_psd_import.desktop
+ krita_psd_export.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_psd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_psd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/raw/CMakeLists.txt b/krita/plugins/formats/raw/CMakeLists.txt
+index c5d6750..b565f3e 100644
+--- a/krita/plugins/formats/raw/CMakeLists.txt
++++ b/krita/plugins/formats/raw/CMakeLists.txt
+@@ -26,5 +26,5 @@ install(TARGETS krita_raw_import DESTINATION ${PLUGIN_INSTALL_DIR})
+ ########### install files ###############
+
+ install( FILES krita_raw_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_raw.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_raw.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+
+diff --git a/krita/plugins/formats/tga/CMakeLists.txt b/krita/plugins/formats/tga/CMakeLists.txt
+index 57be30c..da62d62 100644
+--- a/krita/plugins/formats/tga/CMakeLists.txt
++++ b/krita/plugins/formats/tga/CMakeLists.txt
+@@ -24,4 +24,4 @@ target_link_libraries(kritatgaimport kritaui)
+ install(TARGETS kritatgaimport DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ install( FILES krita_tga_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_tga.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_tga.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/plugins/formats/tiff/CMakeLists.txt b/krita/plugins/formats/tiff/CMakeLists.txt
+index 6cacb32..e9142da 100644
+--- a/krita/plugins/formats/tiff/CMakeLists.txt
++++ b/krita/plugins/formats/tiff/CMakeLists.txt
+@@ -50,5 +50,5 @@ install(TARGETS kritatiffexport DESTINATION ${PLUGIN_INSTALL_DIR})
+ ########### install files ###############
+
+ install( FILES krita_tiff_export.desktop krita_tiff_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_tiff.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_tiff.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+
+diff --git a/krita/plugins/formats/xcf/CMakeLists.txt b/krita/plugins/formats/xcf/CMakeLists.txt
+index 8e484c2..f79187d 100644
+--- a/krita/plugins/formats/xcf/CMakeLists.txt
++++ b/krita/plugins/formats/xcf/CMakeLists.txt
+@@ -29,4 +29,4 @@ endif (WIN32)
+ ########### install files ###############
+
+ install( FILES krita_xcf_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS krita_xcf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS krita_xcf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+diff --git a/krita/sketch/CMakeLists.txt b/krita/sketch/CMakeLists.txt
+index dbbce96..785750f 100644
+--- a/krita/sketch/CMakeLists.txt
++++ b/krita/sketch/CMakeLists.txt
+@@ -149,7 +149,7 @@ target_link_libraries(kritasketch
+ )
+
+ #install(TARGETS kritasketch ${INSTALL_TARGETS_DEFAULT_ARGS})
+-install(PROGRAMS kritasketch.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install(PROGRAMS kritasketch.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install(FILES kritasketchrc kritasketchpanelsrc DESTINATION ${CONFIG_INSTALL_DIR} )
+ install(FILES kritasketch.qml DESTINATION ${DATA_INSTALL_DIR}/kritasketch)
+ install(FILES kritasketch.rc DESTINATION ${DATA_INSTALL_DIR}/kritasketch)
+diff --git a/plan/CMakeLists.txt b/plan/CMakeLists.txt
+index 279d988..95843ed 100644
+--- a/plan/CMakeLists.txt
++++ b/plan/CMakeLists.txt
+@@ -143,7 +143,7 @@ install(TARGETS calligraplan ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install( FILES planpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+ install( FILES plan.rc plan_readonly.rc DESTINATION ${DATA_INSTALL_DIR}/plan)
+-install( PROGRAMS plan.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS plan.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install( FILES planrc DESTINATION ${CONFIG_INSTALL_DIR})
+ install(FILES plansettings.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+ install( FILES plan_viewplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+diff --git a/plan/workpackage/CMakeLists.txt b/plan/workpackage/CMakeLists.txt
+index 86c97e8..b208ea7 100644
+--- a/plan/workpackage/CMakeLists.txt
++++ b/plan/workpackage/CMakeLists.txt
+@@ -119,5 +119,5 @@ install(TARGETS calligraplanwork ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install( FILES planworkpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+ install( FILES planwork.rc planwork_readonly.rc planwork_mainwindow.rc DESTINATION ${DATA_INSTALL_DIR}/planwork)
+ install( FILES planworkrc DESTINATION ${CONFIG_INSTALL_DIR})
+-install( PROGRAMS planwork.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS planwork.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+
+diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt
+index e02967d..40c824e 100644
+--- a/sheets/CMakeLists.txt
++++ b/sheets/CMakeLists.txt
+@@ -426,7 +426,7 @@ install(TARGETS kdeinit_calligrasheets ${INSTALL_TARGETS_DEFAULT_ARGS})
+ target_link_libraries( calligrasheets kdeinit_calligrasheets )
+ install(TARGETS calligrasheets ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+-install( PROGRAMS sheets.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS sheets.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install( FILES sheets.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+
+ endif (SHOULD_BUILD_APP_SHEETS)
+diff --git a/stage/app/CMakeLists.txt b/stage/app/CMakeLists.txt
+index a483a49..9370b9c 100644
+--- a/stage/app/CMakeLists.txt
++++ b/stage/app/CMakeLists.txt
+@@ -25,5 +25,5 @@ install(TARGETS kdeinit_calligrastage ${INSTALL_TARGETS_DEFAULT_ARGS})
+ target_link_libraries(calligrastage kdeinit_calligrastage)
+ install(TARGETS calligrastage ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+-install( PROGRAMS stage.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS stage.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install( FILES stage.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+diff --git a/words/app/CMakeLists.txt b/words/app/CMakeLists.txt
+index 8e32aaa..61d5180 100644
+--- a/words/app/CMakeLists.txt
++++ b/words/app/CMakeLists.txt
+@@ -23,5 +23,5 @@ install(TARGETS kdeinit_calligrawords ${INSTALL_TARGETS_DEFAULT_ARGS})
+ target_link_libraries( calligrawords kdeinit_calligrawords )
+ install(TARGETS calligrawords ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+-install( PROGRAMS words.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS words.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install( FILES words.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
+diff --git a/words/part/CMakeLists.txt b/words/part/CMakeLists.txt
+index bce2d47..6bb0b40 100644
+--- a/words/part/CMakeLists.txt
++++ b/words/part/CMakeLists.txt
+@@ -210,7 +210,7 @@ install(TARGETS calligraauthor ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ install( FILES author/author.rc author/author_readonly.rc DESTINATION ${DATA_INSTALL_DIR}/author)
+ install( FILES author/authorpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
+-install( PROGRAMS author/author.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra)
++install( PROGRAMS author/author.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+ install( FILES author/authorrc DESTINATION ${CONFIG_INSTALL_DIR} )
+
+ endif (SHOULD_BUILD_APP_AUTHOR)
+--
+2.1.0
+
diff --git a/calligra-2.9.0-disable_products.patch b/calligra-2.9.0-disable_products.patch
new file mode 100644
index 0000000..9935a52
--- /dev/null
+++ b/calligra-2.9.0-disable_products.patch
@@ -0,0 +1,15 @@
+diff -up calligra-2.9.0/CMakeLists.txt.disable_products calligra-2.9.0/CMakeLists.txt
+--- calligra-2.9.0/CMakeLists.txt.disable_products 2015-02-24 07:01:01.000000000 -0600
++++ calligra-2.9.0/CMakeLists.txt 2015-02-26 19:28:15.239118472 -0600
+@@ -966,6 +966,11 @@ calligra_drop_products_on_old_flag(words
+ # by calling calligra_disable_product with the product id and the reason,
+ # e.g.:
+ # calligra_disable_product(APP_KEXI "isn't buildable at the moment")
++calligra_disable_product(FILTER_MPXJ_IMPORT "missing runtime deps")
++calligra_disable_product(APP_ACTIVE "not wanted")
++calligra_disable_product(APP_CSTESTER "not wanted")
++calligra_disable_product(APP_DEVTOOLS "not wanted")
++calligra_disable_product(APP_GEMINI "not wanted")
+
+ #############################################
+ #### Calculate buildable products ####
diff --git a/calligra.spec b/calligra.spec
index 8a1bc40..28b6a3b 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -29,8 +29,8 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
Name: calligra
-Version: 2.8.7
-Release: 10%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
Summary: An integrated office suite
License: GPLv2+ and LGPLv2+
@@ -43,19 +43,16 @@ URL: http://www.calligra-suite.org/
%endif
Source0: http://download.kde.org/%{stable}/calligra-%{version}/calligra-%{version}.tar.xz
-# fedora lacks mpxj runtime dep for plan import filter, omit until available
-Patch1: calligra-2.7.90-no_mpxj.patch
-%if 0%{?fedora} > 20
%define revenge 1
-%endif
-Patch2: calligra-2.8.6-librevenge.patch
-%if 0%{?fedora} > 20 || 0%{?rhel} > 6
%define eigen3 1
-%endif
-# https://git.reviewboard.kde.org/r/116611
-Patch3: calligra-eigen3.patch
+
+# support disabling products we don't package yet
+# fedora lacks mpxj runtime dep for plan import filter, omit until available
+Patch2: calligra-2.9.0-disable_products.patch
## upstream patches
+Patch101: 0001-Let-Calligra-Okular-plugins-be-less-aggressively-go-.patch
+Patch102: 0002-Restore-old-installation-location-of-app-desktop-fil.patch
## upstreamable patches
@@ -63,6 +60,9 @@ BuildRequires: boost-devel
BuildRequires: bzip2-devel bzip2
BuildRequires: desktop-file-utils
BuildRequires: doxygen
+%if 0%{?fedora} > 19
+BuildRequires: libappstream-glib
+%endif
%if 0%{?eigen3}
BuildRequires: pkgconfig(eigen3)
%else
@@ -165,6 +165,7 @@ Requires: %{name}-kexi-driver-sybase = %{version}-%{release}
Requires: %{name}-plan = %{version}-%{release}
%if 0%{?okular}
Requires: %{name}-okular-odpgenerator = %{version}-%{release}
+Requires: %{name}-okular-odtgenerator = %{version}-%{release}
%endif
%if 0%{?marble}
Requires: %{name}-reports-map-element = %{version}-%{release}
@@ -488,6 +489,14 @@ Requires: %{name}-stage = %{version}-%{release}
Requires: okular-part
%description okular-odpgenerator
%{summary}.
+
+%package okular-odtgenerator
+Summary: OpenDocument text support for okular
+BuildRequires: okular-devel
+Requires: %{name}-words = %{version}-%{release}
+Requires: okular-part
+%description okular-odtgenerator
+%{summary}.
%endif
%package semanticitems
@@ -500,15 +509,9 @@ Requires: %{name}-core = %{version}-%{release}
%prep
%setup -q
-%if ! 0%{?mpxj}
-%patch1 -p1 -b .no_mpxj
-%endif
-%if 0%{?revenge}
-%patch2 -p1 -b .librevenge
-%endif
-%if 0%{?eigen3}
-%patch3 -p1 -b .eigen3
-%endif
+%patch2 -p1 -b .disable_products
+%patch101 -p1 -b .0001
+%patch102 -p1 -b .0002
## kdchart munging begin
pushd 3rdparty/kdchart
@@ -520,15 +523,14 @@ sed -i -e 's|../src|../kdchart|' include/*
popd
## kdchart munging end
+## disable kritasketch too, not ready
+sed -i -e 's|add_subdirectory(sketch)|#add_subdirectory(sketch)|g' krita/CMakeLists.txt
-%build
-mkdir -p %{_target_platform}
+%build
+mkdir %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} \
- -DBUILD_active:BOOL=OFF \
- -DBUILD_cstester:BOOL=OFF \
- ..
+%{cmake_kde4} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -568,8 +570,8 @@ rm -fv %{buildroot}%{_kde4_libdir}/libkarbon*.so
rm -fv %{buildroot}%{_kde4_libdir}/libkexi*.so
rm -fv %{buildroot}%{_kde4_libdir}/libkisexiv2.so
rm -fv %{buildroot}%{_kde4_libdir}/libkformula.so
-rm -fv %{buildroot}%{_kde4_libdir}/libko{chart,kross,msooxml,plugin,property,report,textlayout,vectorimage,wmf,wv2}.so
-rm -fv %{buildroot}%{_kde4_libdir}/libkrita{image,libbrush,libpaintop,ui}.so
+rm -fv %{buildroot}%{_kde4_libdir}/libko{chart,kross,msooxml,plugin,property,report,textlayout,vectorimage,version,wmf,wv2}.so
+rm -fv %{buildroot}%{_kde4_libdir}/libkrita{color,image,libbrush,libpaintop,ui}.so
rm -fv %{buildroot}%{_kde4_libdir}/libkross*.so
rm -fv %{buildroot}%{_kde4_libdir}/libkplato*.so
rm -fv %{buildroot}%{_kde4_libdir}/libtablesodf.so
@@ -588,14 +590,17 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/kchart*.desktop
rm -fv %{buildroot}%{_kde4_datadir}/mime/packages/krita_ora.xml
-
%check
+for appdata_file in %{buildroot}%{_kde4_datadir}/appdata/*.appdata.xml ; do
+appstream-util validate-relax --nonet ${appdata_file} ||:
+done
for desktop_file in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
-desktop-file-validate ${desktop_file}
+desktop-file-validate ${desktop_file} ||:
done
%files
+#empty metapackage
%post core
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
@@ -638,6 +643,7 @@ fi
%{_kde4_libdir}/kde4/koreport_chartplugin.so
%{_kde4_libdir}/kde4/koreport_webplugin.so
%dir %{_kde4_datadir}/kde4/services/calligra/
+%dir %{_kde4_datadir}/kde4/services/ServiceMenus/calligra/
%{_kde4_datadir}/kde4/services/calligra/koreport_barcodeplugin.desktop
%{_kde4_datadir}/kde4/services/calligra/koreport_chartplugin.desktop
%{_kde4_datadir}/kde4/services/calligra/koreport_webplugin.desktop
@@ -655,29 +661,37 @@ fi
%{_kde4_libdir}/kde4/calligra_shape_text.so
%{_kde4_libdir}/kde4/calligra_shape_vector.so
%{_kde4_libdir}/kde4/calligra_shape_video.so
+%dir %{_kde4_libdir}/calligra/
+%dir %{_kde4_libdir}/calligra/imports/
+%dir %{_kde4_libdir}/calligra/imports/org/
+%dir %{_kde4_libdir}/calligra/imports/org/calligra/
+%{_kde4_libdir}/calligra/imports/org/calligra/CalligraComponents/
%{_kde4_appsdir}/calligra/
%{_kde4_appsdir}/koproperty/
%{_datadir}/mime/packages/msooxml-all.xml
%{_datadir}/mime/packages/calligra_svm.xml
%{_datadir}/mime/packages/krita*.xml
+%{_datadir}/mime/packages/wiki-format.xml
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_datadir}/applications/kde4/calligra.desktop
-%{_kde4_datadir}/kde4/services/calligra_textediting_autocorrect.desktop
-%{_kde4_datadir}/kde4/services/calligra_tool_basicflakes.desktop
+%{_kde4_datadir}/kde4/servicetypes/kopa_tool.desktop
+%dir %{_kde4_datadir}/kde4/services/calligra
+%{_kde4_datadir}/kde4/services/calligra/calligra_textediting_autocorrect.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_tool_basicflakes.desktop
%{_kde4_datadir}/kde4/services/calligra_odg_thumbnail.desktop
-%{_kde4_datadir}/kde4/services/calligradocinfopropspage.desktop
-%{_kde4_datadir}/kde4/services/calligra_docker_defaults.desktop
-%{_kde4_datadir}/kde4/services/calligrastageeventactions.desktop
-%{_kde4_datadir}/kde4/services/calligrastagetoolanimation.desktop
-%{_kde4_datadir}/kde4/services/calligra_textediting_changecase.desktop
-%{_kde4_datadir}/kde4/services/calligra_tool_defaults.desktop
-%{_kde4_datadir}/kde4/services/kolcmsengine.desktop
-%{_kde4_datadir}/kde4/services/kopabackgroundtool.desktop
-%{_kde4_datadir}/kde4/services/calligra_device_spacenavigator.desktop
-%{_kde4_datadir}/kde4/services/calligra_textediting_spellcheck.desktop
-%{_kde4_datadir}/kde4/services/calligra_textinlineobject_variables.desktop
-%{_kde4_datadir}/kde4/services/calligra_textediting_thesaurus.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligradocinfopropspage.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_docker_defaults.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligrastageeventactions.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligrastagetoolanimation.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_textediting_changecase.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_tool_defaults.desktop
+%{_kde4_datadir}/kde4/services/calligra/kolcmsengine.desktop
+%{_kde4_datadir}/kde4/services/calligra/kopabackgroundtool.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_device_spacenavigator.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_textediting_spellcheck.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_textinlineobject_variables.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_textediting_thesaurus.desktop
%{_kde4_datadir}/kde4/servicetypes/calligra_application.desktop
%{_kde4_datadir}/kde4/servicetypes/calligra_deferred_plugin.desktop
%{_kde4_datadir}/kde4/servicetypes/calligra_filter.desktop
@@ -689,27 +703,24 @@ fi
%{_kde4_datadir}/kde4/servicetypes/texteditingplugin.desktop
%{_kde4_datadir}/kde4/servicetypes/widgetfactory.desktop
%{_kde4_libdir}/kde4/calligra_filter_pdf2svg.so
-%{_kde4_datadir}/kde4/services/calligra_filter_pdf2svg.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_artistictext.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_chart.desktop
-%{_kde4_datadir}/kde4/services/kformulapart.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_pdf2svg.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_artistictext.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_chart.desktop
+%{_kde4_datadir}/kde4/services/calligra/kformulapart.desktop
%{_kde4_datadir}/kde4/services/calligra/kexirelationdesignshape.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_formular.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_music.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_picture.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_plugin.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_spreadsheet.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_text.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_vector.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_video.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_formular.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_music.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_picture.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_plugin.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_spreadsheet.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_text.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_vector.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_video.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/calligra_shape_paths.so
-%{_kde4_datadir}/kde4/services/calligra_shape_paths.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_paths.desktop
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -741,10 +752,10 @@ fi
%{_kde4_libdir}/libRtfReader.so.*
%{_kde4_libdir}/libkotextlayout.so.*
%{_kde4_libdir}/libkovectorimage.so.*
+%{_kde4_libdir}/libkoversion.so.*
%files devel
%{_kde4_appsdir}/cmake/modules/FindCalligraLibs.cmake
-%{_kde4_includedir}/*.h
%{_kde4_includedir}/calligra/
%{_kde4_libdir}/libbasicflakes.so
%{_kde4_libdir}/libflake.so
@@ -759,7 +770,7 @@ fi
%{_kde4_libdir}/libkowidgetutils.so
%{_kde4_libdir}/libkundo2.so
%{_kde4_libdir}/libpigmentcms.so
-%{_kde4_includedir}/kexi/
+#{_kde4_includedir}/kexi/
%{_kde4_libdir}/libkformdesigner.so
%{_kde4_includedir}/krita/
%{_kde4_includedir}/stage/
@@ -770,7 +781,7 @@ fi
%postun kdchart -p /sbin/ldconfig
%files kdchart
-%{_kde4_libdir}/libcalligrakdchart.so.13*
+%{_kde4_libdir}/libcalligrakdchart.so.14*
%files kdchart-devel
%{_kde4_libdir}/libcalligrakdchart.so
@@ -794,7 +805,7 @@ fi
%{_kde4_datadir}/applications/kde4/author.desktop
%{_kde4_datadir}/config/authorrc
%{_kde4_appsdir}/author/
-%{_kde4_datadir}/kde4/services/authorpart.desktop
+%{_kde4_datadir}/kde4/services/calligra/authorpart.desktop
%posttrans braindump
update-desktop-database -q &> /dev/null ||:
@@ -806,14 +817,15 @@ fi
%files braindump
%{_kde4_bindir}/braindump
+%{_kde4_datadir}/appdata/braindump.appdata.xml
%{_kde4_datadir}/applications/kde4/braindump.desktop
%{_kde4_appsdir}/braindump/
%{_kde4_datadir}/kde4/servicetypes/braindump_extensions.desktop
%{_kde4_libdir}/kde4/braindump_shape_state.so
%{_kde4_libdir}/kde4/braindump_shape_web.so
%{_kde4_appsdir}/stateshape/
-%{_kde4_datadir}/kde4/services/braindump_shape_state.desktop
-%{_kde4_datadir}/kde4/services/braindump_shape_web.desktop
+%{_kde4_datadir}/kde4/services/calligra/braindump_shape_state.desktop
+%{_kde4_datadir}/kde4/services/calligra/braindump_shape_web.desktop
%post braindump-libs -p /sbin/ldconfig
%postun braindump-libs -p /sbin/ldconfig
@@ -845,29 +857,30 @@ fi
%{_kde4_libdir}/kde4/calligra_filter_*sheets*.so
%{_kde4_libdir}/kde4/calligra_filter_*kspread*.so
%{_kde4_libdir}/kde4/calligra_filter_xls*.so
-%{_kde4_datadir}/kde4/services/calligra_filter_*kspread*.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_xls*.desktop
+%{_kde4_datadir}/kde4/services/sheets_*_thumbnail.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_*kspread*.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_xls*.desktop
%{_kde4_libdir}/kde4/kspread_plugin_tool_calendar.so
%{_kde4_libdir}/kde4/sheetssolver.so
%{_kde4_libdir}/kde4/calligra_shape_spreadsheet-deferred.so
%{_kde4_appsdir}/sheets/
%{_kde4_configdir}/sheetsrc
%{_kde4_datadir}/config.kcfg/sheets.kcfg
-%{_kde4_datadir}/kde4/services/krossmodulesheets.desktop
-%{_kde4_datadir}/kde4/services/kspread_plugin_tool_calendar.desktop
-%{_kde4_datadir}/kde4/services/kspread*module.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_*sheets*.desktop
-%{_kde4_datadir}/kde4/services/sheets_*_thumbnail.desktop
-%{_kde4_datadir}/kde4/services/calligra_shape_spreadsheet-deferred.desktop
-%{_kde4_datadir}/kde4/services/sheetspart.desktop
+%{_kde4_datadir}/kde4/services/calligra/krossmodulesheets.desktop
+%{_kde4_datadir}/kde4/services/calligra/kspread_plugin_tool_calendar.desktop
+%{_kde4_datadir}/kde4/services/calligra/kspread*module.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_*sheets*.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_shape_spreadsheet-deferred.desktop
+%{_kde4_datadir}/kde4/services/calligra/sheetspart.desktop
%{_kde4_datadir}/kde4/servicetypes/sheets_plugin.desktop
%{_kde4_datadir}/kde4/servicetypes/sheets_viewplugin.desktop
-%{_kde4_datadir}/kde4/services/sheetsscripting.desktop
-%{_kde4_datadir}/kde4/services/sheetssolver.desktop
+%{_kde4_datadir}/kde4/services/calligra/sheetsscripting.desktop
+%{_kde4_datadir}/kde4/services/calligra/sheetssolver.desktop
%{_kde4_datadir}/templates/SpreadSheet.desktop
%{_kde4_datadir}/templates/.source/SpreadSheet.ods
+%{_kde4_datadir}/appdata/sheets.appdata.xml
%{_kde4_datadir}/applications/kde4/sheets.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/sheets_print.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/calligra/sheets_print.desktop
%{_kde4_docdir}/HTML/en/sheets/
%post sheets-libs -p /sbin/ldconfig
@@ -895,22 +908,23 @@ fi
%{_kde4_libdir}/kde4/calligra_filter_kpr2odp.so
%{_kde4_libdir}/kde4/calligra_filter_ppt2odp.so
%{_kde4_libdir}/kde4/calligra_filter_pptx2odp.so
-%{_kde4_datadir}/kde4/services/calligra_filter_kpr2odp.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_ppt2odp.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_pptx2odp.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_kpr2odp.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_ppt2odp.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_pptx2odp.desktop
%{_kde4_appsdir}/stage/
%{_kde4_configdir}/stagerc
%{_kde4_docdir}/HTML/en/stage/
-%{_kde4_datadir}/kde4/services/kpr*.desktop
+%{_kde4_datadir}/kde4/services/calligra/kpr*.desktop
%{_kde4_datadir}/kde4/services/stage_*_thumbnail.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.odp
+%{_kde4_datadir}/appdata/stage.appdata.xml
%{_kde4_datadir}/applications/kde4/*stage.desktop
-%{_kde4_datadir}/kde4/services/stagepart.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/stage_print.desktop
+%{_kde4_datadir}/kde4/services/calligra/stagepart.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/calligra/stage_print.desktop
%post stage-libs -p /sbin/ldconfig
%postun stage-libs -p /sbin/ldconfig
@@ -933,22 +947,24 @@ fi
%{_kde4_libdir}/libkdeinit4_karbon.so
%{_kde4_libdir}/kde4/*karbon*.*
%{_kde4_appsdir}/karbon/
-%{_kde4_datadir}/kde4/services/karbon*
-%{_kde4_datadir}/kde4/services/calligra_filter_*karbon*.desktop
+%{_kde4_datadir}/kde4/services/calligra/karbon*
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_*karbon*.desktop
%{_kde4_datadir}/kde4/servicetypes/karbon_dock.desktop
%{_kde4_datadir}/kde4/servicetypes/karbon_viewplugin.desktop
%if 0%{?pstoedit}
%{_kde4_libdir}/kde4/calligra_filter_eps2svgai.so
-%{_kde4_datadir}/kde4/services/calligra_filter_eps2svgai.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_eps2svgai.desktop
%endif
%{_kde4_libdir}/kde4/calligra_filter_wmf2svg.so
%{_kde4_libdir}/kde4/calligra_filter_xfig2odg.so
-%{_kde4_datadir}/kde4/services/calligra_filter_wmf2svg.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_xfig2odg.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_wmf2svg.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_xfig2odg.desktop
+%{_kde4_datadir}/kde4/services/karbon_*_thumbnail.desktop
%{_kde4_datadir}/templates/Illustration.desktop
%{_kde4_datadir}/templates/.source/Illustration.odg
+%{_kde4_datadir}/appdata/karbon.appdata.xml
%{_kde4_datadir}/applications/kde4/*karbon.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/karbon_print.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/calligra/karbon_print.desktop
%post karbon-libs -p /sbin/ldconfig
%postun karbon-libs -p /sbin/ldconfig
@@ -970,40 +986,48 @@ fi
%{_kde4_bindir}/krita
%{_kde4_bindir}/gmicparser
%{_kde4_configdir}/kritarc
-%{_kde4_libdir}/libkdeinit4_krita.so
%{_kde4_libdir}/kde4/*krita*.*
%{_kde4_appsdir}/color-schemes/Krita*.colors
%{_kde4_appsdir}/krita/
+%{_kde4_appsdir}/kritaanimation/
+%{_kde4_appsdir}/kritagemini/
+%{_kde4_appsdir}/kritasketch/
%{_kde4_configdir}/krita*.knsrc
-%{_kde4_datadir}/kde4/services/krita*.desktop
+%{_kde4_datadir}/kde4/services/calligra/krita*.desktop
+%{_kde4_datadir}/kde4/services/krita_*_thumbnail.desktop
%{_kde4_datadir}/kde4/servicetypes/krita*.desktop
%{_kde4_datadir}/applications/kde4/*krita*.desktop
%{_kde4_appsdir}/kritaplugins/
%{_datadir}/color/icc/krita/
-%{_kde4_datadir}/kde4/services/ServiceMenus/krita_print.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/calligra/krita_print.desktop
+%{_datadir}/appdata/krita.appdata.xml
+%if 0
%{_kde4_bindir}/kritagemini
%{_kde4_appsdir}/kritagemini/
%{_kde4_configdir}/kritagemini*
-%{_datadir}/appdata/krita.appdata.xml
-%dir %{_kde4_libdir}/calligra/imports
-%dir %{_kde4_libdir}/calligra/imports/org/
%dir %{_kde4_libdir}/calligra/imports/org/krita/
%{_kde4_libdir}/calligra/imports/org/krita/draganddrop/
-#
%{_kde4_bindir}/kritasketch
%{_kde4_appsdir}/kritasketch/
%{_kde4_configdir}/kritasketch*
%{_kde4_libdir}/calligra/imports/org/krita/sketch/
+%endif
%post krita-libs -p /sbin/ldconfig
%postun krita-libs -p /sbin/ldconfig
%files krita-libs
-%{_kde4_libdir}/libkritasketchlib.so
+%{_kde4_libdir}/libkritacolor.so.*
+# unversioned
+%{_kde4_libdir}/libkritacolord.so
%{_kde4_libdir}/libkritaimage.so.*
%{_kde4_libdir}/libkritalibbrush.so.*
%{_kde4_libdir}/libkritalibpaintop.so.*
%{_kde4_libdir}/libkritaui.so.*
+%{_kde4_libdir}/kde4/plugins/imageformats/kimg_kra.so
+%{_kde4_libdir}/kde4/plugins/imageformats/kimg_ora.so
+%{_kde4_datadir}/kde4/services/qimageioplugins/kra.desktop
+%{_kde4_datadir}/kde4/services/qimageioplugins/ora.desktop
%posttrans kexi
update-desktop-database -q &> /dev/null ||:
@@ -1028,6 +1052,7 @@ fi
%{_kde4_libdir}/kde4/keximigrate_mdb.so
%{_kde4_libdir}/kde4/keximigrate_txt.so
%{_kde4_libdir}/kde4/kexirelationdesignshape.so
+%{_kde4_datadir}/appdata/kexi.appdata.xml
%{_kde4_datadir}/applications/kde4/*kexi.desktop
%{_kde4_datadir}/config/kexirc
%{_kde4_datadir}/kde4/servicetypes/kexi*.desktop
@@ -1099,15 +1124,17 @@ fi
%{_kde4_libdir}/kde4/*flow*.*
%if 0%{?visio}
%{_kde4_libdir}/kde4/calligra_filter_vsdx2odg.so
-%{_kde4_datadir}/kde4/services/calligra_filter_vsdx2odg.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_vsdx2odg.desktop
%endif
%{_kde4_appsdir}/flow/
%{_kde4_configdir}/flow_stencils.knsrc
-%{_kde4_datadir}/kde4/services/flow*.desktop
+%{_kde4_datadir}/kde4/services/calligra/flow*.desktop
+%{_kde4_datadir}/kde4/services/flow_*_thumbnail.desktop
%{_kde4_datadir}/applications/kde4/flow.desktop
+%{_kde4_datadir}//appdata/flow.appdata.xml
%{_kde4_configdir}/flowrc
%{_kde4_datadir}/kde4/servicetypes/flow_dock.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/flow_print.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/calligra/flow_print.desktop
%post flow-libs -p /sbin/ldconfig
%postun flow-libs -p /sbin/ldconfig
@@ -1146,18 +1173,19 @@ fi
%{_kde4_libdir}/kde4/plantjscheduler.so
%{_kde4_datadir}/kde4/servicetypes/plan_schedulerplugin.desktop
%{_kde4_datadir}/kde4/servicetypes/plan_viewplugin.desktop
-%{_kde4_datadir}/kde4/services/krossmoduleplan.desktop
+%{_kde4_datadir}/kde4/services/calligra/krossmoduleplan.desktop
%if 0%{?mpxj}
%{_kde4_libdir}/kde4/planconvert/
%{_datadir}/mime/packages/calligra_planner_mpp.xml
-%{_kde4_datadir}/kde4/services/calligra_filter_mpp2plan.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_planner2plan.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_mpp2plan.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_planner2plan.desktop
%endif
%{_kde4_appsdir}/plan/
%{_kde4_appsdir}/planwork/
%{_kde4_datadir}/config.kcfg/plansettings.kcfg
%{_kde4_datadir}/config.kcfg/planworksettings.kcfg
-%{_kde4_datadir}/kde4/services/plan*.desktop
+%{_kde4_datadir}/kde4/services/calligra/plan*.desktop
+%{_kde4_datadir}/appdata/plan.appdata.xml
%{_kde4_datadir}/applications/kde4/plan.desktop
%{_kde4_datadir}/applications/kde4/planwork.desktop
@@ -1190,43 +1218,46 @@ fi
%{_kde4_appsdir}/words/
%{_kde4_datadir}/templates/TextDocument.desktop
%{_kde4_datadir}/templates/.source/TextDocument.odt
+%{_kde4_datadir}/appdata/words.appdata.xml
%{_kde4_datadir}/applications/kde4/calligrawords_ascii.desktop
%{_kde4_datadir}/applications/kde4/words.desktop
-%{_kde4_datadir}/kde4/services/wordspart.desktop
+%{_kde4_datadir}/kde4/services/calligra/wordspart.desktop
%{_kde4_libdir}/kde4/calligra_filter_applixword2odt.so
%{_kde4_libdir}/kde4/calligra_filter_ascii2words.so
%{_kde4_libdir}/kde4/calligra_filter_doc2odt.so
%{_kde4_libdir}/kde4/calligra_filter_docx2odt.so
%{_kde4_libdir}/kde4/calligra_filter_html2ods.so
%{_kde4_libdir}/kde4/calligra_filter_odt2ascii.so
+%{_kde4_libdir}/kde4/calligra_filter_odt2docx.so
%{_kde4_libdir}/kde4/calligra_filter_odt2epub2.so
%{_kde4_libdir}/kde4/calligra_filter_odt2html.so
%{_kde4_libdir}/kde4/calligra_filter_odt2mobi.so
+%{_kde4_libdir}/kde4/calligra_filter_odt2wiki.so
%{_kde4_libdir}/kde4/calligra_filter_rtf2odt.so
-
%if 0%{?wpd}
-%{_kde4_datadir}/kde4/services/calligra_filter_wpd2odt.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_wpg2odg.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_wpg2svg.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_wps2odt.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_wpd2odt.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_wpg2odg.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_wpg2svg.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_wps2odt.desktop
%{_kde4_libdir}/kde4/calligra_filter_wpd2odt.so
%{_kde4_libdir}/kde4/calligra_filter_wpg2odg.so
%{_kde4_libdir}/kde4/calligra_filter_wpg2svg.so
%{_kde4_libdir}/kde4/calligra_filter_wps2odt.so
%endif
-%{_kde4_datadir}/kde4/services/calligra_filter_applixword2odt.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_ascii2words.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_doc2odt.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_docx2odt.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_html2ods.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_odt2ascii.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_odt2epub2.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_odt2html.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_odt2mobi.desktop
-%{_kde4_datadir}/kde4/services/calligra_filter_rtf2odt.desktop
-
+%{_kde4_datadir}/kde4/services/calligra_filter_odt2wiki.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_applixword2odt.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_ascii2words.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_doc2odt.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_docx2odt.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_html2ods.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_odt2ascii.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_odt2docx.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_odt2epub2.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_odt2html.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_odt2mobi.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_filter_rtf2odt.desktop
%{_kde4_datadir}/kde4/services/words_*_thumbnail.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/words_print.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/calligra/words_print.desktop
%post words-libs -p /sbin/ldconfig
%postun words-libs -p /sbin/ldconfig
@@ -1240,19 +1271,37 @@ fi
%{_kde4_datadir}/applications/kde4/okularApplication_odp.desktop
%{_kde4_datadir}/kde4/services/libokularGenerator_odp.desktop
%{_kde4_datadir}/kde4/services/okularOdp.desktop
+
+%files okular-odtgenerator
+%{_kde4_libdir}/kde4/okularGenerator_odt.so
+%{_kde4_datadir}/applications/kde4/okularApplication_doc_calligra.desktop
+%{_kde4_datadir}/applications/kde4/okularApplication_docx_calligra.desktop
+%{_kde4_datadir}/applications/kde4/okularApplication_odt.desktop
+%{_kde4_datadir}/applications/kde4/okularApplication_wpd_calligra.desktop
+%{_kde4_datadir}/kde4/services/calligra/libokularGenerator_doc_calligra.desktop
+%{_kde4_datadir}/kde4/services/calligra/libokularGenerator_docx_calligra.desktop
+%{_kde4_datadir}/kde4/services/calligra/libokularGenerator_wpd_calligra.desktop
+%{_kde4_datadir}/kde4/services/calligra/okularDoc_calligra.desktop
+%{_kde4_datadir}/kde4/services/calligra/okularDocx_calligra.desktop
+%{_kde4_datadir}/kde4/services/calligra/okularWpd_calligra.desktop
+%{_kde4_datadir}/kde4/services/libokularGenerator_odt.desktop
+%{_kde4_datadir}/kde4/services/okularOdt.desktop
%endif
%files semanticitems
%{_kde4_libdir}/kde4/calligra_semanticitem_contact.so
%{_kde4_libdir}/kde4/calligra_semanticitem_event.so
-%{_kde4_datadir}/kde4/services/calligra_semanticitem_contact.desktop
-%{_kde4_datadir}/kde4/services/calligra_semanticitem_event.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_semanticitem_contact.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_semanticitem_event.desktop
%{_kde4_datadir}/kde4/servicetypes/calligra_semanticitem.desktop
%{_kde4_libdir}/kde4/calligra_semanticitem_location.so
-%{_kde4_datadir}/kde4/services/calligra_semanticitem_location.desktop
+%{_kde4_datadir}/kde4/services/calligra/calligra_semanticitem_location.desktop
%changelog
+* Thu Feb 26 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.0-1
+- 2.9.0
+
* Thu Feb 26 2015 Rex Dieter <rdieter at fedoraproject.org> 2.8.7-10
- rebuild (gcc5)
@@ -1276,7 +1325,7 @@ fi
- disable pstoedit support on f22+ (#1183335)
* Sun Dec 21 2014 Rex Dieter <rdieter at fedoraproject.org> 2.8.7-3
-- move libcalligradb to -libs, likoreport now depends on it (#1176398)
+- move libcalligradb to -libs, libkoreport now depends on it (#1176398)
* Wed Dec 10 2014 Rex Dieter <rdieter at fedoraproject.org> 2.8.7-2
- rebuild (marble)
diff --git a/sources b/sources
index b9c8228..9d53637 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ba4b76e3f81daffb28d3ed545908736 calligra-2.8.7.tar.xz
+78ca03bcd5e5a4aff23694fce3835735 calligra-2.9.0.tar.xz
More information about the scm-commits
mailing list