Browse Source

calligra-2.9.11-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10518 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 7 years ago
parent
commit
9a601fce11
1 changed files with 208 additions and 148 deletions
  1. 208 148
      c/calligra/calligra-vl.spec

+ 208 - 148
c/calligra/calligra-vl.spec

@@ -8,17 +8,17 @@
 %define pstoedit 0
 %define visio 1
 %define wpd 1
+%define gmic 1
 
 %define revenge 1
-%define eigen3 0
 %define external_lilypond_fonts 0
 
 # trim changelog included in binary rpms
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
 Name:    calligra 
-Version: 2.8.7
-Release: 7%{?_dist_release}
+Version: 2.9.11
+Release: 1%{?_dist_release}
 Summary: An integrated office suite
 Summary(ja): 統合オフィススイート
 
@@ -26,13 +26,16 @@ License: GPLv2+ and LGPLv2+
 Group:   Applications/Productivity
 URL:     http://www.calligra-suite.org/
 
+Vendor:  Project Vine
+Distribution: Vine Linux
+
 Source0: http://download.kde.org/stable/calligra-%{version}/calligra-%{version}.tar.xz
 
+# support disabling products we don't package yet
 # fedora lacks mpxj runtime dep for plan import filter, omit until available
-Patch1: calligra-2.7.90-no_mpxj.patch
-Patch2: calligra-2.8.6-librevenge.patch
-# https://git.reviewboard.kde.org/r/116611
-Patch3: calligra-eigen3.patch
+Patch2: calligra-2.9.0-disable_products.patch
+Patch3: 0001-adapt-to-libwps-0.4.patch
+%global libwps libwps-0.4
 
 ## upstream patches
 
@@ -44,14 +47,11 @@ Patch700: calligra-2.8.7-openjpeg.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libboost-devel
+BuildRequires: libboost-system
 BuildRequires: bzip2-devel bzip2
 BuildRequires: desktop-file-utils
 BuildRequires: doxygen
-%if %{?eigen3}
 BuildRequires: eigen3-devel
-%else
-BuildRequires: eigen2-devel
-%endif
 BuildRequires: exiv2-devel >= 0.16
 BuildRequires: fftw3-devel >= 3.2
 BuildRequires: fontconfig-devel
@@ -141,11 +141,13 @@ 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}
 Requires:  %{name}-kexi-map-form-widget = %{version}-%{release}
 %endif
+Requires:  %{name}-qtquick = %{version}-%{release}
 
 %description
 %{summary}.
@@ -561,8 +563,24 @@ Requires: okular%{?_kde4_version: >= %{_kde4_version}}
 
 %description okular-odpgenerator
 %{summary}.
+
+%package  okular-odtgenerator
+Summary:  OpenDocument text support for okular
+Summary(ja): Okular 用の OpenDocument テキストのサポート
+BuildRequires: okular-devel
+Requires: %{name}-words = %{version}-%{release}
+Requires: okular%{?_kde4_version: >= %{_kde4_version}}
+%description okular-odtgenerator
+%{summary}.
 %endif
 
+%package  qtquick
+Summary:  QtQuick Plugin that provides Calligra components
+Requires: %{name}-stage-libs = %{version}-%{release}
+Requires: %{name}-words-libs = %{version}-%{release}
+%description qtquick
+%{summary}.
+
 %package semanticitems
 Summary: RDF support
 Summary(ja): RDF サポート
@@ -576,17 +594,10 @@ Requires: %{name}-core = %{version}-%{release}
 %prep
 %setup -q
 
-%if ! 0%{?mpxj}
-%patch1 -p1 -b .no_mpxj
-%endif
-%if 0%{?revenge}
-%patch2 -p1 -b .librevenge
+%patch2 -p1 -b .disable_products
+%if "%{?libwps}" == "libwps-0.4"
+%patch3 -p1 -b .libwps-0.4
 %endif
-%if 0%{?eigen3}
-%patch3 -p1 -b .eigen3
-%endif
-
-%patch700 -p1 -b .openjpeg2
 
 ## kdchart munging begin
 pushd 3rdparty/kdchart
@@ -598,6 +609,12 @@ sed -i -e 's|../src|../kdchart|' include/*
 popd
 ## kdchart munging end
 
+## disable krita gemini/sketch too, not ready
+sed -i \
+  -e 's|add_subdirectory(sketch)|#add_subdirectory(sketch)|g' \
+  -e 's|add_subdirectory(gemini)|#add_subdirectory(gemini)|g' \
+  krita/CMakeLists.txt
+
 
 %build
 mkdir -p %{_target_platform}
@@ -607,8 +624,7 @@ pushd %{_target_platform}
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
     -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
     -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
-    -DBUILD_active:BOOL=OFF \
-    -DBUILD_cstester:BOOL=OFF \
+    %{!?gmic:-DWITH_GMIC:BOOL=OFF} \
     ..
 popd
 
@@ -650,12 +666,13 @@ rm -fv %{buildroot}%{_libdir}/libkarbon*.so
 rm -fv %{buildroot}%{_libdir}/libkexi*.so
 rm -fv %{buildroot}%{_libdir}/libkisexiv2.so
 rm -fv %{buildroot}%{_libdir}/libkformula.so
-rm -fv %{buildroot}%{_libdir}/libko{chart,kross,msooxml,plugin,property,report,textlayout,vectorimage,wmf,wv2}.so
-rm -fv %{buildroot}%{_libdir}/libkrita{image,libbrush,libpaintop,ui}.so
+rm -fv %{buildroot}%{_libdir}/libko{chart,kross,msooxml,plugin,property,report,textlayout,vectorimage,version,wmf,wv2}.so
+rm -fv %{buildroot}%{_libdir}/libkrita{color,image,libbrush,libpaintop,ui}.so
 rm -fv %{buildroot}%{_libdir}/libkross*.so
 rm -fv %{buildroot}%{_libdir}/libkplato*.so
 rm -fv %{buildroot}%{_libdir}/libtablesodf.so
 rm -fv %{buildroot}%{_libdir}/libkwmf.so
+rm -fv %{buildroot}%{_libdir}/libkrita{global,psd}.so
 rm -fv %{buildroot}%{_libdir}/libplanwork{app,factory}.so
 rm -fv %{buildroot}%{_libdir}/librcps_plan.so
 rm -fv %{buildroot}%{_libdir}/libRtfReader.so
@@ -707,7 +724,8 @@ fi
 
 %files core
 %defattr(-,root,root)
-%doc AUTHORS COPYING COPYING.LIB README
+%license COPYING COPYING.LIB
+%doc AUTHORS README
 %{_bindir}/calligra
 %{_bindir}/calligraconverter
 %{_libdir}/kde4/calligra_textediting_autocorrect.so
@@ -746,24 +764,25 @@ fi
 %{_datadir}/mime/packages/msooxml-all.xml
 %{_datadir}/mime/packages/calligra_svm.xml
 %{_datadir}/mime/packages/krita*.xml
+%{_datadir}/mime/packages/wiki-format.xml
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/oxygen/*/*/*
 %{_datadir}/applications/kde4/calligra.desktop
-%{_datadir}/kde4/services/calligra_textediting_autocorrect.desktop
-%{_datadir}/kde4/services/calligra_tool_basicflakes.desktop
+%{_datadir}/kde4/services/calligra/calligra_textediting_autocorrect.desktop
+%{_datadir}/kde4/services/calligra/calligra_tool_basicflakes.desktop
 %{_datadir}/kde4/services/calligra_odg_thumbnail.desktop
-%{_datadir}/kde4/services/calligradocinfopropspage.desktop
-%{_datadir}/kde4/services/calligra_docker_defaults.desktop
-%{_datadir}/kde4/services/calligrastageeventactions.desktop
-%{_datadir}/kde4/services/calligrastagetoolanimation.desktop
-%{_datadir}/kde4/services/calligra_textediting_changecase.desktop
-%{_datadir}/kde4/services/calligra_tool_defaults.desktop
-%{_datadir}/kde4/services/kolcmsengine.desktop
-%{_datadir}/kde4/services/kopabackgroundtool.desktop
-%{_datadir}/kde4/services/calligra_device_spacenavigator.desktop
-%{_datadir}/kde4/services/calligra_textediting_spellcheck.desktop
-%{_datadir}/kde4/services/calligra_textinlineobject_variables.desktop
-%{_datadir}/kde4/services/calligra_textediting_thesaurus.desktop
+%{_datadir}/kde4/services/calligra/calligradocinfopropspage.desktop
+%{_datadir}/kde4/services/calligra/calligra_docker_defaults.desktop
+%{_datadir}/kde4/services/calligra/calligrastageeventactions.desktop
+%{_datadir}/kde4/services/calligra/calligrastagetoolanimation.desktop
+%{_datadir}/kde4/services/calligra/calligra_textediting_changecase.desktop
+%{_datadir}/kde4/services/calligra/calligra_tool_defaults.desktop
+%{_datadir}/kde4/services/calligra/kolcmsengine.desktop
+%{_datadir}/kde4/services/calligra/kopabackgroundtool.desktop
+%{_datadir}/kde4/services/calligra/calligra_device_spacenavigator.desktop
+%{_datadir}/kde4/services/calligra/calligra_textediting_spellcheck.desktop
+%{_datadir}/kde4/services/calligra/calligra_textinlineobject_variables.desktop
+%{_datadir}/kde4/services/calligra/calligra_textediting_thesaurus.desktop
 %{_datadir}/kde4/servicetypes/calligra_application.desktop
 %{_datadir}/kde4/servicetypes/calligra_deferred_plugin.desktop
 %{_datadir}/kde4/servicetypes/calligra_filter.desktop
@@ -771,31 +790,30 @@ fi
 %{_datadir}/kde4/servicetypes/calligradocker.desktop
 %{_datadir}/kde4/servicetypes/filtereffect.desktop
 %{_datadir}/kde4/servicetypes/inlinetextobject.desktop
+%{_datadir}/kde4/servicetypes/kopa_tool.desktop
 %{_datadir}/kde4/servicetypes/koreport_itemplugin.desktop
 %{_datadir}/kde4/servicetypes/texteditingplugin.desktop
 %{_datadir}/kde4/servicetypes/widgetfactory.desktop
 %{_libdir}/kde4/calligra_filter_pdf2svg.so
-%{_datadir}/kde4/services/calligra_filter_pdf2svg.desktop
-%{_datadir}/kde4/services/calligra_shape_artistictext.desktop
-%{_datadir}/kde4/services/calligra_shape_chart.desktop
-%{_datadir}/kde4/services/kformulapart.desktop
-%{_datadir}/kde4/services/calligra/kexirelationdesignshape.desktop
-%{_datadir}/kde4/services/calligra_shape_formular.desktop
-%{_datadir}/kde4/services/calligra_shape_music.desktop
-%{_datadir}/kde4/services/calligra_shape_picture.desktop
-%{_datadir}/kde4/services/calligra_shape_plugin.desktop
-%{_datadir}/kde4/services/calligra_shape_spreadsheet.desktop
-%{_datadir}/kde4/services/calligra_shape_text.desktop
-%{_datadir}/kde4/services/calligra_shape_vector.desktop
-%{_datadir}/kde4/services/calligra_shape_video.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_pdf2svg.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_artistictext.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_chart.desktop
+%{_datadir}/kde4/services/calligra/kformulapart.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_formular.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_music.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_picture.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_plugin.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_spreadsheet.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_text.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_vector.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_video.desktop
 %{_datadir}/kde4/apps/formulashape/
 %{_datadir}/kde4/apps/musicshape/
 %dir %{_datadir}/color/
 %dir %{_datadir}/color/icc/
-%{_datadir}/color/icc/pigment/
 %{_datadir}/kde4/servicetypes/pigment*.desktop
 %{_libdir}/kde4/calligra_shape_paths.so
-%{_datadir}/kde4/services/calligra_shape_paths.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_paths.desktop
 %{_docdir}/HTML/en/calligra/
 
 %post libs -p /sbin/ldconfig
@@ -803,10 +821,11 @@ fi
 
 %files libs
 %defattr(-,root,root)
+%{_datadir}/kde4/servicetypes/calligradb_driver.desktop
 %{_libdir}/libbasicflakes.so.*
+%{_datadir}/kde4/servicetypes/flake*.desktop
 %{_libdir}/libcalligradb.so.*
 %{_libdir}/libflake.so.*
-%{_libdir}/libkformula.so.*
 %{_libdir}/libkokross.so.*
 %{_libdir}/libkomain.so.*
 %{_libdir}/libkoodf.so.*
@@ -818,27 +837,21 @@ fi
 %{_libdir}/libkoplugin.so.*
 %{_libdir}/libkoreport.so.*
 %{_libdir}/libkotext.so.*
-%{_libdir}/libkotextlayout.so.*
-%{_libdir}/libkovectorimage.so.*
 %{_libdir}/libkowidgets.so.*
 %{_libdir}/libkowidgetutils.so.*
 %{_libdir}/libkowv2.so.9*
+%{_libdir}/libkformula.so.*
 %{_libdir}/libkundo2.so.*
 %{_libdir}/libkomsooxml.so.*
 %{_libdir}/libpigmentcms.so.*
 %{_libdir}/libRtfReader.so.*
-%{_datadir}/kde4/servicetypes/calligradb_driver.desktop
-%{_datadir}/kde4/servicetypes/flake*.desktop
+%{_libdir}/libkotextlayout.so.*
+%{_libdir}/libkovectorimage.so.*
+%{_libdir}/libkoversion.so.*
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/kde4/*.h
-%{_includedir}/kde4/calligra/
-%{_includedir}/kde4/kexi/
-%{_includedir}/kde4/krita/
-%{_includedir}/kde4/stage/
-%{_includedir}/kde4/sheets/
-%{_includedir}/kde4/words/
+%{_includedir}/kde4/*
 %{_libdir}/libbasicflakes.so
 %{_libdir}/libflake.so
 %{_libdir}/libkformdesigner.so
@@ -860,7 +873,7 @@ fi
 
 %files kdchart
 %defattr(-,root,root)
-%{_libdir}/libcalligrakdchart.so.13*
+%{_libdir}/libcalligrakdchart.so.14*
 
 %files kdchart-devel
 %defattr(-,root,root)
@@ -886,7 +899,7 @@ fi
 %{_datadir}/applications/kde4/author.desktop
 %{_datadir}/config/authorrc
 %{_datadir}/kde4/apps/author/
-%{_datadir}/kde4/services/authorpart.desktop
+%{_datadir}/kde4/services/calligra/authorpart.desktop
 
 %posttrans braindump
 update-desktop-database -q &> /dev/null ||:
@@ -899,13 +912,14 @@ fi
 %files braindump
 %defattr(-,root,root)
 %{_bindir}/braindump
+%{_datadir}/appdata/braindump.appdata.xml
 %{_libdir}/kde4/braindump_shape_state.so
 %{_libdir}/kde4/braindump_shape_web.so
 %{_datadir}/applications/kde4/braindump.desktop
 %{_datadir}/kde4/apps/braindump/
 %{_datadir}/kde4/apps/stateshape/
-%{_datadir}/kde4/services/braindump_shape_state.desktop
-%{_datadir}/kde4/services/braindump_shape_web.desktop
+%{_datadir}/kde4/services/calligra/braindump_shape_state.desktop
+%{_datadir}/kde4/services/calligra/braindump_shape_web.desktop
 %{_datadir}/kde4/servicetypes/braindump_extensions.desktop
 
 %post braindump-libs -p /sbin/ldconfig
@@ -932,6 +946,7 @@ fi
 
 %files sheets 
 %{_bindir}/calligrasheets
+%{_datadir}/appdata/sheets.appdata.xml
 %{_libdir}/libkdeinit4_calligrasheets.so
 %{_libdir}/libcalligrasheetsodf.so
 %{_libdir}/kde4/calligrasheets*.so
@@ -940,29 +955,29 @@ fi
 %{_libdir}/kde4/calligra_filter_*sheets*.so
 %{_libdir}/kde4/calligra_filter_*kspread*.so
 %{_libdir}/kde4/calligra_filter_xls*.so
-%{_datadir}/kde4/services/calligra_filter_*kspread*.desktop
-%{_datadir}/kde4/services/calligra_filter_xls*.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_*kspread*.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_xls*.desktop
 %{_libdir}/kde4/kspread_plugin_tool_calendar.so
 %{_libdir}/kde4/sheetssolver.so
 %{_libdir}/kde4/calligra_shape_spreadsheet-deferred.so
 %{_datadir}/kde4/apps/sheets/
 %{_datadir}/config/sheetsrc
 %{_datadir}/config.kcfg/sheets.kcfg
-%{_datadir}/kde4/services/krossmodulesheets.desktop
-%{_datadir}/kde4/services/kspread_plugin_tool_calendar.desktop
-%{_datadir}/kde4/services/kspread*module.desktop
-%{_datadir}/kde4/services/calligra_filter_*sheets*.desktop
+%{_datadir}/kde4/services/calligra/krossmodulesheets.desktop
+%{_datadir}/kde4/services/calligra/kspread_plugin_tool_calendar.desktop
+%{_datadir}/kde4/services/calligra/kspread*module.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_*sheets*.desktop
 %{_datadir}/kde4/services/sheets_*_thumbnail.desktop
-%{_datadir}/kde4/services/calligra_shape_spreadsheet-deferred.desktop
-%{_datadir}/kde4/services/sheetspart.desktop
+%{_datadir}/kde4/services/calligra/calligra_shape_spreadsheet-deferred.desktop
+%{_datadir}/kde4/services/calligra/sheetspart.desktop
 %{_datadir}/kde4/servicetypes/sheets_plugin.desktop
 %{_datadir}/kde4/servicetypes/sheets_viewplugin.desktop
-%{_datadir}/kde4/services/sheetsscripting.desktop
-%{_datadir}/kde4/services/sheetssolver.desktop
+%{_datadir}/kde4/services/calligra/sheetsscripting.desktop
+%{_datadir}/kde4/services/calligra/sheetssolver.desktop
 %{_datadir}/templates/SpreadSheet.desktop
 %{_datadir}/templates/.source/SpreadSheet.ods
 %{_datadir}/applications/kde4/sheets.desktop
-%{_datadir}/kde4/services/ServiceMenus/sheets_print.desktop
+%{_datadir}/kde4/services/ServiceMenus/calligra/sheets_print.desktop
 %{_docdir}/HTML/en/sheets/
 
 %post sheets-libs -p /sbin/ldconfig
@@ -985,6 +1000,7 @@ fi
 %defattr(-,root,root)
 %doc stage/AUTHORS stage/CHANGES
 %{_bindir}/calligrastage
+%{_datadir}/appdata/stage.appdata.xml
 %{_libdir}/libkdeinit4_calligrastage.so
 %{_libdir}/kde4/*stage*.*
 %{_libdir}/kde4/kpr_pageeffect_*.so
@@ -992,13 +1008,13 @@ fi
 %{_libdir}/kde4/calligra_filter_kpr2odp.so
 %{_libdir}/kde4/calligra_filter_ppt2odp.so
 %{_libdir}/kde4/calligra_filter_pptx2odp.so
-%{_datadir}/kde4/services/calligra_filter_kpr2odp.desktop
-%{_datadir}/kde4/services/calligra_filter_ppt2odp.desktop
-%{_datadir}/kde4/services/calligra_filter_pptx2odp.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_kpr2odp.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_ppt2odp.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_pptx2odp.desktop
 %{_datadir}/kde4/apps/stage/
 %{_datadir}/config/stagerc
 %{_docdir}/HTML/en/stage/
-%{_datadir}/kde4/services/kpr*.desktop
+%{_datadir}/kde4/services/calligra/kpr*.desktop
 %{_datadir}/kde4/services/stage_*_thumbnail.desktop
 %{_datadir}/kde4/servicetypes/kpr*.desktop
 %{_datadir}/kde4/servicetypes/presentationeventaction.desktop
@@ -1006,8 +1022,8 @@ fi
 %{_datadir}/templates/Presentation.desktop
 %{_datadir}/templates/.source/Presentation.odp
 %{_datadir}/applications/kde4/*stage.desktop
-%{_datadir}/kde4/services/stagepart.desktop
-%{_datadir}/kde4/services/ServiceMenus/stage_print.desktop
+%{_datadir}/kde4/services/calligra/stagepart.desktop
+%{_datadir}/kde4/services/ServiceMenus/calligra/stage_print.desktop
 
 %post stage-libs -p /sbin/ldconfig
 %postun stage-libs -p /sbin/ldconfig
@@ -1028,26 +1044,29 @@ fi
 %files karbon
 %defattr(-,root,root)
 %{_bindir}/karbon
+%{_datadir}/appdata/karbon.appdata.xml
 %{_datadir}/config/karbonrc
 %{_libdir}/libkdeinit4_karbon.so
 %{_libdir}/kde4/*karbon*.*
 %{_datadir}/kde4/apps/karbon/
-%{_datadir}/kde4/services/karbon*
-%{_datadir}/kde4/services/calligra_filter_*karbon*.desktop
+%{_datadir}/kde4/services/calligra/karbon*
+%{_datadir}/kde4/services/calligra/calligra_filter_*karbon*.desktop
 %{_datadir}/kde4/servicetypes/karbon_dock.desktop
 %{_datadir}/kde4/servicetypes/karbon_viewplugin.desktop
 %if 0%{?pstoedit}
 %{_libdir}/kde4/calligra_filter_eps2svgai.so
-%{_datadir}/kde4/services/calligra_filter_eps2svgai.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_eps2svgai.desktop
 %endif
 %{_libdir}/kde4/calligra_filter_wmf2svg.so
 %{_libdir}/kde4/calligra_filter_xfig2odg.so
-%{_datadir}/kde4/services/calligra_filter_wmf2svg.desktop
-%{_datadir}/kde4/services/calligra_filter_xfig2odg.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_wmf2svg.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_xfig2odg.desktop
+%{_datadir}/kde4/services/karbon_*_thumbnail.desktop
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.odg
+%{_datadir}/appdata/karbon.appdata.xml
 %{_datadir}/applications/kde4/*karbon.desktop
-%{_datadir}/kde4/services/ServiceMenus/karbon_print.desktop
+%{_datadir}/kde4/services/ServiceMenus/calligra/karbon_print.desktop
 
 %post karbon-libs -p /sbin/ldconfig
 %postun karbon-libs -p /sbin/ldconfig
@@ -1069,44 +1088,42 @@ fi
 %defattr(-,root,root)
 %doc krita/AUTHORS krita/ChangeLog krita/README
 %{_bindir}/krita
-%{_bindir}/kritagemini
-%{_bindir}/kritasketch
-%{_bindir}/gmicparser
+%{?gmic:%{_bindir}/gmicparser}
 %{_datadir}/config/kritarc
-%{_libdir}/libkdeinit4_krita.so
 %{_libdir}/kde4/*krita*.*
-%{_datadir}/applications/kde4/*krita*.desktop
-%{_datadir}/color/icc/krita/
-%{_datadir}/config/krita*.knsrc
 %{_datadir}/kde4/apps/color-schemes/Krita*.colors
 %{_datadir}/kde4/apps/krita/
-%{_datadir}/kde4/services/krita*.desktop
+%{_datadir}/kde4/apps/kritaanimation/
+%{_datadir}/kde4/apps/kritagemini/
+%{_datadir}/kde4/apps/kritasketch/
+%{_datadir}/config/krita*.knsrc
+%{_datadir}/kde4/services/calligra/krita*.desktop
+%{_datadir}/kde4/services/krita_*_thumbnail.desktop
 %{_datadir}/kde4/servicetypes/krita*.desktop
+%{_datadir}/applications/kde4/*krita*.desktop
 %{_datadir}/kde4/apps/kritaplugins/
-%{_datadir}/kde4/services/ServiceMenus/krita_print.desktop
-%{_datadir}/kde4/apps/kritagemini/
-%{_datadir}/config/kritagemini*
-%dir %{_datadir}/appdata
+%{_datadir}/color/icc/krita/
+%{_datadir}/kde4/services/ServiceMenus/calligra/krita_print.desktop
 %{_datadir}/appdata/krita.appdata.xml
-%dir %{_libdir}/calligra/imports
-%dir %{_libdir}/calligra/imports/org/
-%dir %{_libdir}/calligra/imports/org/krita/
-%{_libdir}/calligra/imports/org/krita/draganddrop/
-#
-%{_datadir}/kde4/apps/kritasketch/
-%{_datadir}/config/kritasketch*
-%{_libdir}/calligra/imports/org/krita/sketch/
 
 %post krita-libs -p /sbin/ldconfig
 %postun krita-libs -p /sbin/ldconfig
 
 %files krita-libs
 %defattr(-,root,root)
-%{_libdir}/libkritasketchlib.so
+%{_libdir}/libkritaglobal.so.*
+%{_libdir}/libkritacolor.so.*
+%{_libdir}/libkritapsd.so.*
+# unversioned
+%{_libdir}/libkritacolord.so
 %{_libdir}/libkritaimage.so.*
 %{_libdir}/libkritalibbrush.so.*
 %{_libdir}/libkritalibpaintop.so.*
 %{_libdir}/libkritaui.so.*
+%{_libdir}/kde4/plugins/imageformats/kimg_kra.so
+%{_libdir}/kde4/plugins/imageformats/kimg_ora.so
+%{_datadir}/kde4/services/qimageioplugins/kra.desktop
+%{_datadir}/kde4/services/qimageioplugins/ora.desktop
 
 %posttrans kexi
 update-desktop-database -q &> /dev/null ||:
@@ -1120,6 +1137,7 @@ fi
 %defattr(-,root,root)
 %doc kexi/CHANGES kexi/README
 %{_bindir}/kexi*
+%{_datadir}/appdata/kexi.appdata.xml
 %{_libdir}/kde4/kformdesigner_containers.so
 %{_libdir}/kde4/kformdesigner_kexidbwidgets.so
 %{_libdir}/kde4/kformdesigner_stdwidgets.so
@@ -1130,7 +1148,6 @@ fi
 %{_libdir}/kde4/kexidb_sqlite3_icu.so
 %{_libdir}/kde4/keximigrate_mdb.so
 %{_libdir}/kde4/keximigrate_txt.so
-%{_libdir}/kde4/kexirelationdesignshape.so
 %{_datadir}/applications/kde4/*kexi.desktop
 %{_datadir}/config/kexirc
 %{_datadir}/kde4/apps/kexi/
@@ -1208,17 +1225,22 @@ fi
 %{_bindir}/calligraflow
 %{_libdir}/libkdeinit4_calligraflow.so
 %{_libdir}/kde4/*flow*.*
-%{_datadir}/applications/kde4/flow.desktop
-%{_datadir}/config/flow_stencils.knsrc
-%{_datadir}/config/flowrc
-%{_datadir}/kde4/apps/flow/
-%{_datadir}/kde4/services/flow*.desktop
-%{_datadir}/kde4/services/ServiceMenus/flow_print.desktop
-%{_datadir}/kde4/servicetypes/flow_dock.desktop
 %if 0%{?visio}
 %{_libdir}/kde4/calligra_filter_vsdx2odg.so
-%{_datadir}/kde4/services/calligra_filter_vsdx2odg.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_vsdx2odg.desktop
+%{_datadir}/kde4/services/flow_vsdx_thumbnail.desktop
+%endif
+%{_datadir}/kde4/apps/flow/
+%{_datadir}/config/flow_stencils.knsrc
+%{_datadir}/kde4/services/calligra/flow*.desktop
+%if 0%{?wpd}
+%{_datadir}/kde4/services/flow_wpg_thumbnail.desktop
 %endif
+%{_datadir}/applications/kde4/flow.desktop
+%{_datadir}/appdata/flow.appdata.xml
+%{_datadir}/config/flowrc
+%{_datadir}/kde4/servicetypes/flow_dock.desktop
+%{_datadir}/kde4/services/ServiceMenus/calligra/flow_print.desktop
 
 %post flow-libs -p /sbin/ldconfig
 %postun flow-libs -p /sbin/ldconfig
@@ -1246,6 +1268,7 @@ fi
 %doc plan/CHANGELOG plan/TODO
 %{_bindir}/calligraplan
 %{_bindir}/calligraplanwork
+%{_datadir}/appdata/plan.appdata.xml
 %{_libdir}/libkdeinit4_calligraplan.so
 %{_libdir}/libkdeinit4_calligraplanwork.so
 %{_libdir}/kde4/kplatorcpsscheduler.so
@@ -1263,14 +1286,14 @@ fi
 %{_datadir}/config.kcfg/planworksettings.kcfg
 %{_datadir}/kde4/apps/plan/
 %{_datadir}/kde4/apps/planwork/
-%{_datadir}/kde4/services/krossmoduleplan.desktop
-%{_datadir}/kde4/services/plan*.desktop
+%{_datadir}/kde4/services/calligra/krossmoduleplan.desktop
+%{_datadir}/kde4/services/calligra/plan*.desktop
 %{_datadir}/kde4/servicetypes/plan_schedulerplugin.desktop
 %{_datadir}/kde4/servicetypes/plan_viewplugin.desktop
 %if 0%{?mpxj}
 %{_libdir}/kde4/planconvert/
-%{_datadir}/kde4/services/calligra_filter_mpp2plan.desktop
-%{_datadir}/kde4/services/calligra_filter_planner2plan.desktop
+%{_datadir}/kde4/services/calligracalligra_filter_mpp2plan.desktop
+%{_datadir}/kde4/services/calligracalligra_filter_planner2plan.desktop
 %{_datadir}/mime/packages/calligra_planner_mpp.xml
 %endif
 
@@ -1288,6 +1311,12 @@ fi
 %{_libdir}/libkplatomodels.so.*
 %{_libdir}/librcps_plan.so.*
 
+%files qtquick
+%dir %{_libdir}/calligra/imports
+%dir %{_libdir}/calligra/imports/org/
+%dir %{_libdir}/calligra/imports/org/calligra/
+%{_libdir}/calligra/imports/org/calligra/CalligraComponents/
+
 %posttrans words
 update-desktop-database -q &> /dev/null ||:
 
@@ -1299,13 +1328,14 @@ fi
 %files words
 %defattr(-,root,root)
 %{_bindir}/calligrawords
+%{_datadir}/appdata/words.appdata.xml
 %{_libdir}/libkdeinit4_calligrawords.so
 %{_libdir}/kde4/wordspart.*
 %{_datadir}/applications/kde4/calligrawords_ascii.desktop
 %{_datadir}/applications/kde4/words.desktop
 %{_datadir}/config/wordsrc
 %{_datadir}/kde4/apps/words/
-%{_datadir}/kde4/services/wordspart.desktop
+%{_datadir}/kde4/services/calligra/wordspart.desktop
 %{_datadir}/templates/TextDocument.desktop
 %{_datadir}/templates/.source/TextDocument.odt
 %{_libdir}/kde4/calligra_filter_applixword2odt.so
@@ -1314,34 +1344,37 @@ fi
 %{_libdir}/kde4/calligra_filter_docx2odt.so
 %{_libdir}/kde4/calligra_filter_html2ods.so
 %{_libdir}/kde4/calligra_filter_odt2ascii.so
+%{_libdir}/kde4/calligra_filter_odt2docx.so
 %{_libdir}/kde4/calligra_filter_odt2epub2.so
 %{_libdir}/kde4/calligra_filter_odt2html.so
 %{_libdir}/kde4/calligra_filter_odt2mobi.so
+%{_libdir}/kde4/calligra_filter_odt2wiki.so
 %{_libdir}/kde4/calligra_filter_rtf2odt.so
 
 %if 0%{?wpd}
-%{_datadir}/kde4/services/calligra_filter_wpd2odt.desktop
-%{_datadir}/kde4/services/calligra_filter_wpg2odg.desktop
-%{_datadir}/kde4/services/calligra_filter_wpg2svg.desktop
-%{_datadir}/kde4/services/calligra_filter_wps2odt.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_wpd2odt.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_wpg2odg.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_wpg2svg.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_wps2odt.desktop
 %{_libdir}/kde4/calligra_filter_wpd2odt.so
 %{_libdir}/kde4/calligra_filter_wpg2odg.so
 %{_libdir}/kde4/calligra_filter_wpg2svg.so
 %{_libdir}/kde4/calligra_filter_wps2odt.so
 %endif
-%{_datadir}/kde4/services/calligra_filter_applixword2odt.desktop
-%{_datadir}/kde4/services/calligra_filter_ascii2words.desktop
-%{_datadir}/kde4/services/calligra_filter_doc2odt.desktop
-%{_datadir}/kde4/services/calligra_filter_docx2odt.desktop
-%{_datadir}/kde4/services/calligra_filter_html2ods.desktop
-%{_datadir}/kde4/services/calligra_filter_odt2ascii.desktop
-%{_datadir}/kde4/services/calligra_filter_odt2epub2.desktop
-%{_datadir}/kde4/services/calligra_filter_odt2html.desktop
-%{_datadir}/kde4/services/calligra_filter_odt2mobi.desktop
-%{_datadir}/kde4/services/calligra_filter_rtf2odt.desktop
-
+%{_datadir}/kde4/services/calligra_filter_odt2wiki.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_applixword2odt.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_ascii2words.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_doc2odt.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_docx2odt.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_html2ods.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_odt2ascii.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_odt2docx.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_odt2epub2.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_odt2html.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_odt2mobi.desktop
+%{_datadir}/kde4/services/calligra/calligra_filter_rtf2odt.desktop
 %{_datadir}/kde4/services/words_*_thumbnail.desktop
-%{_datadir}/kde4/services/ServiceMenus/words_print.desktop
+%{_datadir}/kde4/services/ServiceMenus/calligra/words_print.desktop
 
 %post words-libs -p /sbin/ldconfig
 %postun words-libs -p /sbin/ldconfig
@@ -1355,8 +1388,32 @@ fi
 %defattr(-,root,root)
 %{_libdir}/kde4/okularGenerator_odp.so
 %{_datadir}/applications/kde4/okularApplication_odp.desktop
+%{_datadir}/applications/kde4/okularApplication_powerpoint_calligra.desktop
+
+%{_datadir}/applications/kde4/okularApplication_pptx_calligra.desktop
 %{_datadir}/kde4/services/libokularGenerator_odp.desktop
+%{_datadir}/kde4/services/libokularGenerator_powerpoint_calligra.desktop
+%{_datadir}/kde4/services/libokularGenerator_pptx_calligra.desktop
 %{_datadir}/kde4/services/okularOdp.desktop
+%{_datadir}/kde4/services/okularPowerpoint_calligra.desktop
+%{_datadir}/kde4/services/okularPptx_calligra.desktop
+
+%files okular-odtgenerator
+%{_libdir}/kde4/okularGenerator_odt.so
+%{_datadir}/applications/kde4/okularApplication_doc_calligra.desktop
+%{_datadir}/applications/kde4/okularApplication_docx_calligra.desktop
+%{_datadir}/applications/kde4/okularApplication_odt.desktop
+%{_datadir}/kde4/services/libokularGenerator_doc_calligra.desktop
+%{_datadir}/kde4/services/libokularGenerator_docx_calligra.desktop
+%{_datadir}/kde4/services/okularDoc_calligra.desktop
+%{_datadir}/kde4/services/okularDocx_calligra.desktop
+%{_datadir}/kde4/services/libokularGenerator_odt.desktop
+%{_datadir}/kde4/services/okularOdt.desktop
+%if 0%{?wpd}
+%{_datadir}/applications/kde4/okularApplication_wpd_calligra.desktop
+%{_datadir}/kde4/services/libokularGenerator_wpd_calligra.desktop
+%{_datadir}/kde4/services/okularWpd_calligra.desktop
+%endif
 %endif
 
 %files semanticitems
@@ -1364,13 +1421,16 @@ fi
 %{_libdir}/kde4/calligra_semanticitem_contact.so
 %{_libdir}/kde4/calligra_semanticitem_event.so
 %{_libdir}/kde4/calligra_semanticitem_location.so
-%{_datadir}/kde4/services/calligra_semanticitem_contact.desktop
-%{_datadir}/kde4/services/calligra_semanticitem_event.desktop
-%{_datadir}/kde4/services/calligra_semanticitem_location.desktop
+%{_datadir}/kde4/services/calligra/calligra_semanticitem_contact.desktop
+%{_datadir}/kde4/services/calligra/calligra_semanticitem_event.desktop
+%{_datadir}/kde4/services/calligra/calligra_semanticitem_location.desktop
 %{_datadir}/kde4/servicetypes/calligra_semanticitem.desktop
 
 
 %changelog
+* Sun Jul  3 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.11-1
+- new upstream release.
+
 * Mon May 09 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.7-7
 - rebuild with poppler-0.43.0