Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2015-12-16 17:42:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra (Old) and /work/SRC/openSUSE:Factory/.calligra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra" Changes: -------- --- /work/SRC/openSUSE:Factory/calligra/calligra.changes 2015-12-09 22:13:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2015-12-16 17:42:55.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Dec 11 22:05:32 UTC 2015 - [email protected] + +- Update to 2.9.10 + * Bugfix release, for more details please see + https://www.calligra.org/news/calligra-2-9-10-released/ + +------------------------------------------------------------------- +Fri Dec 4 13:17:11 UTC 2015 - [email protected] + +- Cleanup with spec-cleaner +- Remove 12.3 conditionals +- Remove koffice mentions as 12.1 is out of migration scope support +- Only suggest calligra-doc, not needed unless you really want it + +------------------------------------------------------------------- Old: ---- calligra-2.9.9.tar.xz New: ---- calligra-2.9.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.v49uOw/_old 2015-12-16 17:43:08.000000000 +0100 +++ /var/tmp/diff_new_pack.v49uOw/_new 2015-12-16 17:43:08.000000000 +0100 @@ -17,7 +17,7 @@ Name: calligra -Version: 2.9.9 +Version: 2.9.10 Release: 0 Summary: Libraries and Base Files for the KDE Office Suite License: GPL-2.0+ and LGPL-2.1+ and GFDL-1.2 @@ -25,16 +25,9 @@ Url: http://www.calligra.org/ Source0: http://download.kde.org/stable/%{name}-%{version}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE adapt-to-libwps-0.4.patch boo#942107 -- makes it build against libwps 0.4 (taken from Fedora) -Patch: adapt-to-libwps-0.4.patch -%if 0%{?suse_version} > 1230 +Patch0: adapt-to-libwps-0.4.patch BuildRequires: OpenColorIO-devel -%endif BuildRequires: OpenEXR-devel -%if 0%{?suse_version} > 1320 -%ifarch %ix86 x86_64 -BuildRequires: Vc-devel-static -%endif -%endif BuildRequires: create-resources BuildRequires: eigen3-devel BuildRequires: fdupes @@ -67,29 +60,10 @@ BuildRequires: pkgconfig(libkactivities) BuildRequires: pkgconfig(poppler-qt4) BuildRequires: pkgconfig(qca2) -%if 0%{?suse_version} > 1310 -BuildRequires: libetonyek-devel >= 0.1.0 -BuildRequires: libodfgen-devel >= 0.1.0 -BuildRequires: librevenge-devel >= 0.0.0 -BuildRequires: pkgconfig(libvisio-0.1) -BuildRequires: pkgconfig(libwpd-0.10) -BuildRequires: pkgconfig(libwpg-0.3) -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} -BuildRequires: pkgconfig(libwps-0.4) -%else -BuildRequires: pkgconfig(libwps-0.3) -%endif -%else -BuildRequires: libodfgen-devel -BuildRequires: libvisio-devel -BuildRequires: libwpd-devel -BuildRequires: libwpg-devel -BuildRequires: libwps-devel -%endif Requires(post): shared-mime-info Requires(postun): shared-mime-info -Recommends: %{name}-doc = %{version} Recommends: kdepim4-runtime +Suggests: %{name}-doc = %{version} Suggests: calligra-braindump Suggests: calligra-flow Suggests: calligra-karbon @@ -105,15 +79,33 @@ # calligra-kthesaurus was last used at version 2.4.92 in KDE:Release:49 Provides: calligra-kthesaurus = %{version} Obsoletes: calligra-kthesaurus < %{version} -# koffice2 was last used at version 2.3.1 in openSUSE 12.1 -Obsoletes: koffice2 < %{version} -Obsoletes: koffice2-kformula < %{version} -Obsoletes: koffice2-kthesaurus < %{version} -%kde4_runtime_requires -%kde4_pimlibs_requires -Requires(post): shared-mime-info -Requires(postun): shared-mime-info BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{kde4_runtime_requires} +%{kde4_pimlibs_requires} +%if 0%{?suse_version} > 1320 +%ifarch %ix86 x86_64 +BuildRequires: Vc-devel-static +%endif +%endif +%if 0%{?suse_version} > 1310 +BuildRequires: libetonyek-devel >= 0.1.0 +BuildRequires: libodfgen-devel >= 0.1.0 +BuildRequires: librevenge-devel >= 0.0.0 +BuildRequires: pkgconfig(libvisio-0.1) +BuildRequires: pkgconfig(libwpd-0.10) +BuildRequires: pkgconfig(libwpg-0.3) +%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} +BuildRequires: pkgconfig(libwps-0.4) +%else +BuildRequires: pkgconfig(libwps-0.3) +%endif +%else +BuildRequires: libodfgen-devel +BuildRequires: libvisio-devel +BuildRequires: libwpd-devel +BuildRequires: libwpg-devel +BuildRequires: libwps-devel +%endif %description The Calligra Suite is a set of applications that allows you to easily complete @@ -161,8 +153,6 @@ Requires: calligra-plan Requires: calligra-sheets Requires: calligra-words-common -# koffice2 was last used at version 2.3.1 in openSUSE 12.1 -Obsoletes: koffice2-devel < %{version} %description devel This package contains the build environment needed to compile Calligra @@ -183,8 +173,6 @@ License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: %{name} = %{version} -# koffice2 was last used at version 2.3.1 in openSUSE 12.1 -Obsoletes: koffice2-kivio < %{version} %{kde4_runtime_requires} %description flow @@ -218,8 +206,6 @@ Group: Productivity/Office/Suite Requires: %{name} = %{version} Requires: pstoedit -# koffice2 was last used at version 2.3.1 in openSUSE 12.1 -Obsoletes: koffice2-karbon < %{version} %{kde4_runtime_requires} %description karbon @@ -237,8 +223,6 @@ Suggests: kexi-postgresql-driver Suggests: kexi-spreadsheet-import Suggests: kexi-xbase-driver -# koffice2 was last used at version 2.3.1 in openSUSE 12.1 -Obsoletes: koffice2-kexi < %{version} %{kde4_runtime_requires} %description kexi @@ -320,8 +304,6 @@ Recommends: create-resources Recommends: libwacom2 Suggests: kcm_tablet -# koffice2 was last used at version 2.3.1 in openSUSE 12.1 -Obsoletes: koffice2-krita < %{version} %{kde4_runtime_requires} %description krita @@ -332,8 +314,6 @@ License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: %{name} = %{version} -# koffice2 was last used at version 2.3.1 in openSUSE 12.1 -Obsoletes: koffice2-kplato < %{version} %{kde4_runtime_requires} %{kde4_pimlibs_requires} @@ -345,8 +325,6 @@ License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: %{name} = %{version} -# koffice2 was last used at version 2.3.1 in openSUSE 12.1 -Obsoletes: koffice2-kpresenter < %{version} %{kde4_runtime_requires} %description stage @@ -357,8 +335,6 @@ License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: %{name} = %{version} -# koffice2 was last used at version 2.3.1 in openSUSE 12.1 -Obsoletes: koffice2-kspread < %{version} %{kde4_runtime_requires} %description sheets @@ -380,8 +356,6 @@ Group: Productivity/Office/Suite Requires: %{name} = %{version} Requires: calligra-words-common = %{version} -# koffice2 was last used at version 2.3.1 in openSUSE 12.1 -Obsoletes: koffice2-kword < %{version} %{kde4_runtime_requires} %description words @@ -434,7 +408,7 @@ %prep %setup -q %if 0%{?suse_version} > 1320 || 0%{?is_opensuse} -%patch -p1 +%patch0 -p1 %endif # Remove build time references so build-compare can do its work @@ -448,11 +422,11 @@ %build %cmake_kde4 -d build -- -DIHAVEPATCHEDQT=true -%{make_jobs} +%make_jobs %install cd build -%{kde4_makeinstall} +%kde4_makeinstall # Create filelists %create_subdir_filelist -d 3rdparty -f main -v devel @@ -524,7 +498,7 @@ %suse_update_desktop_file -r sheets Qt KDE Office Spreadsheet %suse_update_desktop_file -r words Qt KDE Office WordProcessor -%{kde_post_install} +%kde_post_install %post /sbin/ldconfig ++++++ calligra-2.9.9.tar.xz -> calligra-2.9.10.tar.xz ++++++ /work/SRC/openSUSE:Factory/calligra/calligra-2.9.9.tar.xz /work/SRC/openSUSE:Factory/.calligra.new/calligra-2.9.10.tar.xz differ: char 27, line 1
