rdieter pushed to calligra (master). "qtquick subpkg, -kexi: move kexirelationdesignshape here"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri May 8 01:05:50 UTC 2015


From cde42f709f45abf3cb054059379c0b3a68e90e35 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 7 May 2015 20:05:39 -0500
Subject: qtquick subpkg, -kexi: move kexirelationdesignshape here


diff --git a/calligra.spec b/calligra.spec
index a89fd37..bee9db8 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -29,7 +29,7 @@
 
 Name:    calligra 
 Version: 2.9.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: An integrated office suite
 
 License: GPLv2+ and LGPLv2+
@@ -168,6 +168,7 @@ Requires:  %{name}-okular-odtgenerator = %{version}-%{release}
 Requires:  %{name}-reports-map-element = %{version}-%{release}
 Requires:  %{name}-kexi-map-form-widget = %{version}-%{release}
 %endif
+Requires:  %{name}-qtquick = %{version}-%{release}
 
 %description
 %{summary}.
@@ -500,6 +501,13 @@ Requires: okular-part
 %{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
 Requires: %{name}-core = %{version}-%{release}
@@ -664,12 +672,7 @@ fi
 %{_kde4_libdir}/kde4/calligra_shape_text.so
 %{_kde4_libdir}/kde4/calligra_shape_vector.so
 %{_kde4_libdir}/kde4/calligra_shape_video.so
-%{_kde4_libdir}/kde4/kexirelationdesignshape.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
@@ -711,7 +714,6 @@ fi
 %{_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/calligra_shape_formular.desktop
 %{_kde4_datadir}/kde4/services/calligra/calligra_shape_music.desktop
 %{_kde4_datadir}/kde4/services/calligra/calligra_shape_picture.desktop
@@ -1057,11 +1059,13 @@ fi
 %{_kde4_libdir}/kde4/kexidb_sqlite3_icu.so
 %{_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
 %{_kde4_datadir}/kde4/services/calligra/kexicsv_importexporthandler.desktop
+%{_kde4_datadir}/kde4/services/calligra/kexirelationdesignshape.desktop
 %{_kde4_datadir}/kde4/services/calligra/kexiformhandler.desktop
 %{_kde4_datadir}/kde4/services/calligra/keximigrationhandler.desktop
 %{_kde4_datadir}/kde4/services/calligra/kexiqueryhandler.desktop
@@ -1207,6 +1211,12 @@ fi
 %{_kde4_libdir}/libkplatomodels.so.*
 %{_kde4_libdir}/librcps_plan.so.*
 
+%files qtquick
+%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/
+
 %posttrans words
 update-desktop-database -q &> /dev/null ||:
 
@@ -1304,6 +1314,9 @@ fi
 
 
 %changelog
+* Thu May 07 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.4-2
+- -qtquick subpkg, -kexi: move kexirelationdesignshape here
+
 * Thu May 07 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.4-1
 - 2.9.4, BR: s/marble-devel/marble-widget-devel/
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?h=master&id=cde42f709f45abf3cb054059379c0b3a68e90e35


More information about the scm-commits mailing list