Project import/calligra - Diff c59ada6b0f...9eccb0db12

... ... --- a/.abf.yml
... ... +++ b/.abf.yml
... ... @@ -1,2 +1,2 @@
1 1
sources:
2
  calligra-3.0.1.tar.xz: 73b152446899399766c13ee95ae378cf5eee2876
2
  calligra-3.1.0.tar.xz: ad9f942f99c80d16eba30c2ec5027cecb7d495bc
... ... --- a/calligra.spec
... ... +++ b/calligra.spec
... ... @@ -2,7 +2,7 @@
2 2
3 3
Summary:	Set of office applications for KDE
4 4
Name:		calligra
5
Version:	3.0.1
5
Version:	3.1.0
6 6
Release:	1
7 7
#koffice has epoch 15. We need upper epoch
8 8
Epoch:		16
... ... @@ -146,7 +146,6 @@ Common files for Calligra.
146 146
%{_kde5_datadir}/calligra/pics/questionmark.png
147 147
%{_kde5_datadir}/calligra/styles/markers.xml
148 148
%{_kde5_datadir}/calligra_shape_music/fonts/Emmentaler-14.ttf
149
%{_kde5_qmldir}/org/calligra/CalligraComponents
150 149
%{_kde5_qmldir}/org/kde/calligra
151 150
%{_kde5_services}/calligra_odg_thumbnail.desktop
152 151
%{_kde5_services}/calligradocinfopropspage.desktop
... ... @@ -180,6 +179,31 @@ Common files for Calligra.
179 179
180 180
#--------------------------------------------------------------------
181 181
182
%package gemini
183
Summary:	Touch optimised user interface for Calligra
184
Group:		Office
185
Requires:	%{name}-words = %{EVRD}
186
Requires:	stage = %{EVRD}
187
Requires:	kirigami2
188
189
%description gemini
190
Calligra Gemini is an application encasing word processor and presentation
191
components which would function both as a traditional desktop application
192
with a mouse and keyboard, and transform into a touch friendly application
193
on the go, changing the experience to one suitable for all-touch devices
194
without the inconvenience of having to switch to a different application.
195
196
%files gemini
197
%{_kde5_bindir}/calligragemini
198
%{_kde5_bindir}/calligrageminithumbnailhelper
199
%{_kde5_applicationsdir}/org.kde.calligragemini.desktop
200
%{_kde5_datadir}/calligragemini
201
%{_kde5_iconsdir}/hicolor/*/*/calligragemini.*
202
%{_kde5_qmldir}/Calligra/Gemini/
203
%{_appdatadir}/org.kde.calligragemini.appdata.xml
204
205
#--------------------------------------------------------------------
206
182 207
%package -n karbon
183 208
Summary:	Scalable drawing for calligra
184 209
Group:		Office
... ... @@ -234,46 +258,6 @@ art.
258 258
259 259
#--------------------------------------------------------------------
260 260
261
%package -n plan
262
Summary:	Project management application for Calligra
263
Group:		Office
264
Url:		http://www.calligra-suite.org/plan/
265
Requires:	%{name}-core = %{EVRD}
266
Provides:	%{name}-apps = %{EVRD}
267
Conflicts:	calligra-l10n < 3.0
268
269
%description -n plan
270
Plan is a project management application.
271
It is intended for managing moderately large projects with multiple resources.
272
273
%files -n plan -f plan.lang
274
%{_kde5_bindir}/calligraplan
275
%{_kde5_bindir}/calligraplanwork
276
%{_kde5_applicationsdir}/org.kde.calligraplan.desktop
277
%{_kde5_applicationsdir}/org.kde.calligraplanwork.desktop
278
%{_kde5_datadir}/calligraplan
279
%{_kde5_datadir}/calligraplanwork
280
%{_kde5_sysconfdir}/xdg/calligraplanrc
281
%{_kde5_sysconfdir}/xdg/calligraplanworkrc
282
%{_kde5_datadir}/config.kcfg/calligraplansettings.kcfg
283
%{_kde5_datadir}/config.kcfg/calligraplanworksettings.kcfg
284
%{_kde5_iconsdir}/hicolor/*/*/calligraplan*
285
%{_kde5_iconsdir}/hicolor/*/*/application-x-vnd.kde.plan*
286
%{_kde5_iconsdir}/hicolor/*/mimetypes/application-x-vnd.kde.kplato.*
287
%{_kde5_libdir}/libkdeinit5_calligraplan.so
288
%{_kde5_libdir}/libkdeinit5_calligraplanwork.so
289
%{_kde5_xmlguidir}/calligraplan
290
%{_kde5_xmlguidir}/calligraplanwork
291
%{_appdatadir}/org.kde.calligraplan.appdata.xml
292
%{_qt5_plugindir}/calligra/formatfilters/planicalexport.so
293
%{_qt5_plugindir}/calligra/formatfilters/plankplatoimport.so
294
%{_qt5_plugindir}/calligra/parts/calligraplanpart.so
295
%{_qt5_plugindir}/calligraplanworkpart.so
296
%{_qt5_plugindir}/calligraplan/schedulers/libplantjscheduler.so
297
%{_qt5_plugindir}/kreport/planreport_textplugin.so
298
299
#--------------------------------------------------------------------
300
301 261
%package -n sheets
302 262
Summary:	SpreadSheet for calligra
303 263
Group:		Office
... ... @@ -390,7 +374,6 @@ With it, you can create informative and attractive documents with ease.
374 374
%{_kde5_bindir}/calligrawords
375 375
%{_kde5_applicationsdir}/org.kde.calligrawords_ascii.desktop
376 376
%{_kde5_applicationsdir}/org.kde.calligrawords.desktop
377
%{_kde5_applicationsdir}/calligra_filter_odt2docx.desktop
378 377
%{_kde5_datadir}/calligrawords
379 378
%{_kde5_sysconfdir}/xdg/calligrawordsrc
380 379
%{_kde5_datadir}/mime/packages/wiki-format.xml
... ... @@ -420,7 +403,7 @@ With it, you can create informative and attractive documents with ease.
403 403
404 404
#--------------------------------------------------------------------
405 405
406
%define libbasicflakes_major 15
406
%define libbasicflakes_major 16
407 407
%define libbasicflakes %mklibname basicflakes %{libbasicflakes_major}
408 408
409 409
%package -n %{libbasicflakes}
... ... @@ -435,7 +418,7 @@ Calligra core library.
418 418
419 419
#--------------------------------------------------------------------
420 420
421
%define sheets_major 15
421
%define sheets_major 16
422 422
%define libcalligrasheetscommon %mklibname calligrasheetscommon %{sheets_major}
423 423
424 424
%package -n %{libcalligrasheetscommon}
... ... @@ -450,7 +433,7 @@ Calligra core library.
433 433
434 434
#--------------------------------------------------------------------
435 435
436
%define sheetsodf_major 15
436
%define sheetsodf_major 16
437 437
%define libcalligrasheetsodf %mklibname calligrasheetsodf %{sheetsodf_major}
438 438
439 439
%package -n %{libcalligrasheetsodf}
... ... @@ -465,7 +448,7 @@ Calligra core library.
448 448
449 449
#--------------------------------------------------------------------
450 450
451
%define calligrastageprivate_major 15
451
%define calligrastageprivate_major 16
452 452
%define libcalligrastageprivate %mklibname calligrastageprivate %{calligrastageprivate_major}
453 453
454 454
%package -n %{libcalligrastageprivate}
... ... @@ -480,7 +463,7 @@ Calligra core library.
463 463
464 464
#--------------------------------------------------------------------
465 465
466
%define libflake_major 15
466
%define libflake_major 16
467 467
%define libflake %mklibname flake %{libflake_major}
468 468
469 469
%package -n %{libflake}
... ... @@ -500,7 +483,22 @@ that Words can provide a textShape which has text flowing inside.
483 483
484 484
#--------------------------------------------------------------------
485 485
486
%define karboncommon_major 15
486
%define gemini_major 16
487
%define libgemini %mklibname gemini %{gemini_major}
488
489
%package -n %{libgemini}
490
Summary:	Calligra Gemini shared library
491
Group:		System/Libraries
492
493
%description -n %{libgemini}
494
Calligra Gemini shared library.
495
496
%files -n %{libgemini}
497
%{_kde5_libdir}/libgemini.so.%{gemini_major}*
498
499
#--------------------------------------------------------------------
500
501
%define karboncommon_major 16
487 502
%define libkarboncommon %mklibname karboncommon %{karboncommon_major}
488 503
489 504
%package -n %{libkarboncommon}
... ... @@ -515,7 +513,7 @@ Calligra core library.
513 513
514 514
#--------------------------------------------------------------------
515 515
516
%define karbonui_major 15
516
%define karbonui_major 16
517 517
%define libkarbonui %mklibname karbonui %{karbonui_major}
518 518
519 519
%package -n %{libkarbonui}
... ... @@ -530,7 +528,7 @@ Calligra core library.
528 528
529 529
#--------------------------------------------------------------------
530 530
531
%define koformula_major 15
531
%define koformula_major 16
532 532
%define libkoformula %mklibname koformula %{koformula_major}
533 533
534 534
%package -n %{libkoformula}
... ... @@ -545,7 +543,7 @@ Calligra core library.
543 543
544 544
#--------------------------------------------------------------------
545 545
546
%define libkomain_major 15
546
%define libkomain_major 16
547 547
%define libkomain %mklibname komain %{libkomain_major}
548 548
549 549
%package -n %{libkomain}
... ... @@ -560,7 +558,7 @@ Calligra core library.
558 558
559 559
#--------------------------------------------------------------------
560 560
561
%define komsooxml_major 15
561
%define komsooxml_major 16
562 562
%define libkomsooxml %mklibname komsooxml %{komsooxml_major}
563 563
564 564
%package -n %{libkomsooxml}
... ... @@ -575,7 +573,7 @@ Calligra core library.
573 573
574 574
#--------------------------------------------------------------------
575 575
576
%define libkoodf_major 15
576
%define libkoodf_major 16
577 577
%define libkoodf %mklibname koodf %{libkoodf_major}
578 578
579 579
%package -n %{libkoodf}
... ... @@ -590,7 +588,7 @@ Calligra core library. ODF Library.
588 588
589 589
#--------------------------------------------------------------------
590 590
591
%define koodf2_major 15
591
%define koodf2_major 16
592 592
%define libkoodf2 %mklibname koodf2_ %{koodf2_major}
593 593
594 594
%package -n %{libkoodf2}
... ... @@ -605,7 +603,7 @@ Calligra core library.
603 603
604 604
#--------------------------------------------------------------------
605 605
606
%define koodfreader_major 15
606
%define koodfreader_major 16
607 607
%define libkoodfreader %mklibname koodfreader %{koodfreader_major}
608 608
609 609
%package -n %{libkoodfreader}
... ... @@ -620,7 +618,7 @@ Calligra core library.
618 618
619 619
#--------------------------------------------------------------------
620 620
621
%define libkopageapp_major 15
621
%define libkopageapp_major 16
622 622
%define libkopageapp %mklibname kopageapp %{libkopageapp_major}
623 623
624 624
%package -n %{libkopageapp}
... ... @@ -635,7 +633,7 @@ Calligra core library.
633 633
634 634
#--------------------------------------------------------------------
635 635
636
%define libkoplugin_major 15
636
%define libkoplugin_major 16
637 637
%define libkoplugin %mklibname koplugin %{libkoplugin_major}
638 638
639 639
%package -n %{libkoplugin}
... ... @@ -650,7 +648,7 @@ Calligra core library.
648 648
649 649
#--------------------------------------------------------------------
650 650
651
%define kostore_major 15
651
%define kostore_major 16
652 652
%define libkostore %mklibname kostore %{kostore_major}
653 653
654 654
%package -n %{libkostore}
... ... @@ -665,7 +663,7 @@ Calligra core library.
663 663
664 664
#--------------------------------------------------------------------
665 665
666
%define libkotext_major 15
666
%define libkotext_major 16
667 667
%define libkotext %mklibname kotext %{libkotext_major}
668 668
669 669
%package -n %{libkotext}
... ... @@ -683,7 +681,7 @@ loading/saving.
681 681
682 682
#--------------------------------------------------------------------
683 683
684
%define kotextlayout_major 15
684
%define kotextlayout_major 16
685 685
%define libkotextlayout %mklibname textlayout %{kotextlayout_major}
686 686
687 687
%package -n %{libkotextlayout}
... ... @@ -698,7 +696,7 @@ Calligra core library.
696 696
697 697
#--------------------------------------------------------------------
698 698
699
%define kovectorimage_major 15
699
%define kovectorimage_major 16
700 700
%define libkovectorimage %mklibname kovectorimage %{kovectorimage_major}
701 701
702 702
%package -n %{libkovectorimage}
... ... @@ -713,7 +711,7 @@ Calligra core library.
711 711
712 712
#--------------------------------------------------------------------
713 713
714
%define koversion_major 15
714
%define koversion_major 16
715 715
%define libkoversion %mklibname koversion %{koversion_major}
716 716
717 717
%package -n %{libkoversion}
... ... @@ -728,7 +726,7 @@ Calligra core library.
726 726
727 727
#--------------------------------------------------------------------
728 728
729
%define kowidgets_major 15
729
%define kowidgets_major 16
730 730
%define libkowidgets %mklibname kowidgets %{kowidgets_major}
731 731
732 732
%package -n %{libkowidgets}
... ... @@ -743,7 +741,7 @@ Calligra core library.
741 741
742 742
#--------------------------------------------------------------------
743 743
744
%define libkowidgetutils_major 15
744
%define libkowidgetutils_major 16
745 745
%define libkowidgetutils %mklibname kowidgetutils %{libkowidgetutils_major}
746 746
747 747
%package -n %{libkowidgetutils}
... ... @@ -771,54 +769,9 @@ Calligra core library.
769 769
%files -n %{libkowv2}
770 770
%{_kde5_libdir}/libkowv2.so.%{kowv2_major}*
771 771
772
#-------------------------------------------------------------------
773
774
%define kplatokernel_major 15
775
%define libkplatokernel %mklibname kplatokernel %{kplatokernel_major}
776
777
%package -n %{libkplatokernel}
778
Summary:	Calligra core library
779
Group:		System/Libraries
780
781
%description -n %{libkplatokernel}
782
Calligra core library.
783
784
%files -n %{libkplatokernel}
785
%{_kde5_libdir}/libkplatokernel.so.%{kplatokernel_major}*
786
787
#--------------------------------------------------------------------
788
789
%define kplatomodels_major 15
790
%define libkplatomodels %mklibname kplatomodels %{kplatomodels_major}
791
792
%package -n %{libkplatomodels}
793
Summary:	Calligra core library
794
Group:		System/Libraries
795
796
%description -n %{libkplatomodels}
797
Calligra core library.
798
799
%files -n %{libkplatomodels}
800
%{_kde5_libdir}/libkplatomodels.so.%{kplatomodels_major}*
801
802 772
#--------------------------------------------------------------------
803 773
804
%define kplatoui_major 15
805
%define libkplatoui %mklibname kplatoui %{kplatoui_major}
806
807
%package -n %{libkplatoui}
808
Summary:	Calligra core library
809
Group:		System/Libraries
810
811
%description -n %{libkplatoui}
812
Calligra core library.
813
814
%files -n %{libkplatoui}
815
%{_kde5_libdir}/libkplatoui.so.%{kplatoui_major}*
816
817
#--------------------------------------------------------------------
818
819
%define kundo2_major 15
774
%define kundo2_major 16
820 775
%define libkundo2 %mklibname kundo2_ %{kundo2_major}
821 776
822 777
%package -n %{libkundo2}
... ... @@ -833,7 +786,7 @@ Calligra core library.
786 786
787 787
#--------------------------------------------------------------------
788 788
789
%define pigmentcms_major 15
789
%define pigmentcms_major 16
790 790
%define libpigmentcms %mklibname pigmentcms %{pigmentcms_major}
791 791
792 792
%package -n %{libpigmentcms}
... ... @@ -854,37 +807,7 @@ be specified in some colorspaces.
807 807
808 808
#--------------------------------------------------------------------
809 809
810
%define planprivate_major 15
811
%define libplanprivate %mklibname planprivate %{planprivate_major}
812
813
%package -n %{libplanprivate}
814
Summary:	Calligra core library
815
Group:		System/Libraries
816
817
%description -n %{libplanprivate}
818
Calligra core library.
819
820
%files -n %{libplanprivate}
821
%{_kde5_libdir}/libplanprivate.so.%{planprivate_major}*
822
823
#--------------------------------------------------------------------
824
825
%define kplatoworkfactory_major 15
826
%define libplanworkfactory %mklibname kplatoworkfactory %{kplatoworkfactory_major}
827
828
%package -n %{libplanworkfactory}
829
Summary:	Calligra core library
830
Group:		System/Libraries
831
832
%description -n %{libplanworkfactory}
833
Calligra core library.
834
835
%files -n %{libplanworkfactory}
836
%{_kde5_libdir}/libplanworkfactory.so.%{kplatoworkfactory_major}*
837
838
#--------------------------------------------------------------------
839
840
%define rtfreader_major 15
810
%define rtfreader_major 16
841 811
%define librtfreader %mklibname rtfreader %{rtfreader_major}
842 812
843 813
%package -n %{librtfreader}
... ... @@ -899,7 +822,7 @@ Calligra core library.
822 822
823 823
#--------------------------------------------------------------------
824 824
825
%define wordsprivate_major 15
825
%define wordsprivate_major 16
826 826
%define libwordsprivate %mklibname wordsprivate %{wordsprivate_major}
827 827
828 828
%package -n %{libwordsprivate}
... ... @@ -922,6 +845,7 @@ Requires: %{libcalligrasheetscommon} = %{EVRD}
845 845
Requires:	%{libcalligrasheetsodf} = %{EVRD}
846 846
Requires:	%{libcalligrastageprivate} = %{EVRD}
847 847
Requires:	%{libflake} = %{EVRD}
848
Requires:	%{libgemini} = %{EVRD}
848 849
Requires:	%{libkarboncommon} = %{EVRD}
849 850
Requires:	%{libkarbonui} = %{EVRD}
850 851
Requires:	%{libkoformula} = %{EVRD}
... ... @@ -940,13 +864,8 @@ Requires: %{libkoversion} = %{EVRD}
864 864
Requires:	%{libkowidgets} = %{EVRD}
865 865
Requires:	%{libkowidgetutils} = %{EVRD}
866 866
Requires:	%{libkowv2} = %{EVRD}
867
Requires:	%{libkplatokernel} = %{EVRD}
868
Requires:	%{libkplatomodels} = %{EVRD}
869
Requires:	%{libkplatoui} = %{EVRD}
870 867
Requires:	%{libkundo2} = %{EVRD}
871 868
Requires:	%{libpigmentcms} = %{EVRD}
872
Requires:	%{libplanprivate} = %{EVRD}
873
Requires:	%{libplanworkfactory} = %{EVRD}
874 869
Requires:	%{librtfreader} = %{EVRD}
875 870
Requires:	%{libwordsprivate} = %{EVRD}
876 871
Requires:	%{name}-core = %{EVRD}
... ... @@ -960,6 +879,7 @@ Header files needed for developing calligra applications.
879 879
%{_kde5_libdir}/libcalligrasheetsodf.so
880 880
%{_kde5_libdir}/libcalligrastageprivate.so
881 881
%{_kde5_libdir}/libflake.so
882
%{_kde5_libdir}/libgemini.so
882 883
%{_kde5_libdir}/libkarboncommon.so
883 884
%{_kde5_libdir}/libkarbonui.so
884 885
%{_kde5_libdir}/libkoformula.so
... ... @@ -978,13 +898,8 @@ Header files needed for developing calligra applications.
898 898
%{_kde5_libdir}/libkowidgets.so
899 899
%{_kde5_libdir}/libkowidgetutils.so
900 900
%{_kde5_libdir}/libkowv2.so
901
%{_kde5_libdir}/libkplatokernel.so
902
%{_kde5_libdir}/libkplatomodels.so
903
%{_kde5_libdir}/libkplatoui.so
904 901
%{_kde5_libdir}/libkundo2.so
905 902
%{_kde5_libdir}/libpigmentcms.so
906
%{_kde5_libdir}/libplanprivate.so
907
%{_kde5_libdir}/libplanworkfactory.so
908 903
%{_kde5_libdir}/libRtfReader.so
909 904
%{_kde5_libdir}/libwordsprivate.so
910 905
... ... @@ -1017,9 +932,6 @@ kocolorspaces koconverter %{name}.lang
932 932
933 933
%find_lang karbon KarbonFilterEffects KarbonTools karbon.lang
934 934
935
%find_lang calligraplan calligraplan_scheduler_rcps calligraplan_scheduler_tj calligraplanlibs \
936
calligraplanwork krossmoduleplan plan.lang
937
938 935
%find_lang calligrasheets calligrasheets_calendar calligrasheets_solver krossmodulesheets \
939 936
calligra_shape_spreadsheet sheets.lang
940 937