Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2014-08-25 11:04:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-10 14:56:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2014-08-25 11:06:19.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Aug 22 10:46:38 UTC 2014 - [email protected] + +- Run osc service localrun clean_spec_file + +------------------------------------------------------------------- +Tue Jul 22 08:14:18 UTC 2014 - [email protected] + +- Add calligra-2.8.5-librevenge.patch + * port calligra to librevenge framework based libraries. + +------------------------------------------------------------------- New: ---- calligra-2.8.5-librevenge.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.AVLNW1/_old 2014-08-25 11:06:22.000000000 +0200 +++ /var/tmp/diff_new_pack.AVLNW1/_new 2014-08-25 11:06:22.000000000 +0200 @@ -24,9 +24,8 @@ Group: Productivity/Office/Suite Url: http://www.calligra.org/ Source0: http://download.kde.org/stable/%{name}-%{version}/%{name}-%{version}.tar.xz -%if 0%{?suse_version} > 1230 -BuildRequires: OpenColorIO-devel -%endif +# PATCH-FIX-UPSTREAM calligra-2.8.5-librevenge.patch [email protected] -- port to librevenge based libwpg +Patch0: calligra-2.8.5-librevenge.patch BuildRequires: OpenEXR-devel BuildRequires: create-resources BuildRequires: fdupes @@ -36,6 +35,7 @@ BuildRequires: gsl-devel BuildRequires: libQtWebKit-devel BuildRequires: libeigen2-devel +BuildRequires: libetonyek-devel >= 0.1.0 BuildRequires: libexiv2-devel BuildRequires: libgsf-devel BuildRequires: libicu-devel @@ -44,16 +44,13 @@ BuildRequires: liblcms-devel BuildRequires: liblcms2-devel BuildRequires: libmysqld-devel -BuildRequires: libodfgen-devel +BuildRequires: libodfgen-devel >= 0.1.0 BuildRequires: libpoppler-qt4-devel BuildRequires: libpqxx-devel BuildRequires: libqca2-devel BuildRequires: librcps-devel +BuildRequires: librevenge-devel >= 0.0.0 BuildRequires: libspnav-devel -BuildRequires: libvisio-devel -BuildRequires: libwpd-devel -BuildRequires: libwpg-devel -BuildRequires: libwps-devel BuildRequires: marble-devel BuildRequires: mysql-devel BuildRequires: okular-devel @@ -65,6 +62,12 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(libkactivities) +BuildRequires: pkgconfig(libvisio-0.1) +BuildRequires: pkgconfig(libwpd-0.10) +BuildRequires: pkgconfig(libwpg-0.3) +BuildRequires: pkgconfig(libwps-0.3) +Requires(post): shared-mime-info +Requires(postun): shared-mime-info Recommends: %{name}-doc = %{version} Recommends: kdepim4-runtime Suggests: calligra-braindump @@ -112,7 +115,7 @@ License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: calligra-words-common = %{version} -%kde4_runtime_requires +%{kde4_runtime_requires} %description author Author is the minimalistic word processor application of the Calligra Suite. @@ -121,7 +124,7 @@ Summary: Mind Mapper Application License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite -%kde4_runtime_requires +%{kde4_runtime_requires} %description braindump Braindump is the mind mapper application of the Calligra Suite. @@ -162,7 +165,7 @@ Requires: %{name} = %{version} # koffice2 was last used at version 2.3.1 in openSUSE 12.1 Obsoletes: koffice2-kivio < %{version} -%kde4_runtime_requires +%{kde4_runtime_requires} %description flow Flow is the flow chart drawing application of the Calligra Suite. @@ -175,7 +178,7 @@ Requires: pstoedit # koffice2 was last used at version 2.3.1 in openSUSE 12.1 Obsoletes: koffice2-karbon < %{version} -%kde4_runtime_requires +%{kde4_runtime_requires} %description karbon Karbon is the vector drawing application of the Calligra Suite. @@ -194,7 +197,10 @@ Suggests: kexi-xbase-driver # koffice2 was last used at version 2.3.1 in openSUSE 12.1 Obsoletes: koffice2-kexi < %{version} -%kde4_runtime_requires +%{kde4_runtime_requires} +%if 0%{?suse_version} < 1310 +Suggests: kexi-postgresql-driver +%endif %description kexi Kexi is the database application of the Calligra Suite. @@ -203,7 +209,7 @@ Summary: Database Application - MS SQL & Sybase Server driver License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite -%kde4_runtime_requires +%{kde4_runtime_requires} %description kexi-mssql-driver Kexi is the database application of the Calligra Suite. @@ -214,7 +220,7 @@ Summary: Database Application - MySQL driver License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite -%kde4_runtime_requires +%{kde4_runtime_requires} %description kexi-mysql-driver Kexi is the database application of the Calligra Suite. @@ -225,7 +231,7 @@ Summary: Database Application - PostgreSQL driver License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite -%kde4_runtime_requires +%{kde4_runtime_requires} %description kexi-postgresql-driver Kexi is the database application of the Calligra Suite. @@ -236,7 +242,7 @@ Summary: Spreadsheet-to-Kexi-table import plugin License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite -%kde4_runtime_requires +%{kde4_runtime_requires} %description kexi-spreadsheet-import Kexi is the database application of the Calligra Suite. @@ -247,7 +253,7 @@ Summary: Database Application - SQLite3 driver License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite -%kde4_runtime_requires +%{kde4_runtime_requires} %description kexi-sqlite3-driver Kexi is the database application of the Calligra Suite. @@ -258,7 +264,7 @@ Summary: Database Application - XBase driver License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite -%kde4_runtime_requires +%{kde4_runtime_requires} %description kexi-xbase-driver Kexi is the database application of the Calligra Suite. @@ -270,14 +276,14 @@ License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: %{name} = %{version} +Requires(post): shared-mime-info +Requires(postun): shared-mime-info 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} -Requires(post): shared-mime-info -Requires(postun): shared-mime-info -%kde4_runtime_requires +%{kde4_runtime_requires} %description krita Krita is the image manipulation application of the Calligra Suite. @@ -289,8 +295,8 @@ 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 +%{kde4_runtime_requires} +%{kde4_pimlibs_requires} %description plan Plan is the project management application of the Calligra Suite. @@ -302,7 +308,7 @@ Requires: %{name} = %{version} # koffice2 was last used at version 2.3.1 in openSUSE 12.1 Obsoletes: koffice2-kpresenter < %{version} -%kde4_runtime_requires +%{kde4_runtime_requires} %description stage Stage is the presentation application of the Calligra Suite. @@ -314,7 +320,7 @@ Requires: %{name} = %{version} # koffice2 was last used at version 2.3.1 in openSUSE 12.1 Obsoletes: koffice2-kspread < %{version} -%kde4_runtime_requires +%{kde4_runtime_requires} %description sheets Sheets is the spreadsheet application of the Calligra Suite. @@ -324,7 +330,7 @@ License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: %{name} = %{version} -%kde4_runtime_requires +%{kde4_runtime_requires} %description tools This package contains various tools for the Calligra Suite. @@ -337,7 +343,7 @@ 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 +%{kde4_runtime_requires} %description words Words is the word processor application of the Calligra Suite. @@ -347,7 +353,7 @@ License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: %{name} = %{version} -%kde4_runtime_requires +%{kde4_runtime_requires} %description words-common Common files for the Author and Words applications of the Calligra Suite. @@ -356,7 +362,7 @@ Summary: commandline tool for conversion License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite -%kde4_runtime_requires +%{kde4_runtime_requires} %description extras-converter commandline tool for conversion between any file formats for which @@ -368,7 +374,7 @@ Group: Productivity/Office/Suite Requires: calligra-stage = %{version} Supplements: packageand(%{name}-stage:okular) -%kde4_runtime_requires +%{kde4_runtime_requires} %description extras-okular plugin for Okular supporting files in the formats ODP and MS PPT/PPTX @@ -378,7 +384,7 @@ License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Supplements: packageand(%{name}:dolphin) -%kde4_runtime_requires +%{kde4_runtime_requires} %description extras-dolphin plugin for the Dolphin file properties dialog, displaying the @@ -388,14 +394,15 @@ %prep %setup -q +%patch0 -p1 %build %cmake_kde4 -d build -- -DBUILD_active=false -DIHAVEPATCHEDQT=true -%make_jobs +%{make_jobs} %install cd build -%kde4_makeinstall +%{kde4_makeinstall} # Create filelists %create_subdir_filelist -d 3rdparty -f main -v devel @@ -436,7 +443,7 @@ cd .. # Remove doc files from filelists (packaged in calligra-doc) -sed -ri s,.*/usr/share/doc/kde/HTML/en/.*,, filelists/* +sed -ri s,.*%{_datadir}/doc/kde/HTML/en/.*,, filelists/* # Remove ome sketch files from krita filelist (filelists doesn't like spaces in filenames) sed -ri s,.*/calligra/imports/org/krita/sketch/panels/filterconfigpages/.*,, filelists/krita @@ -465,15 +472,15 @@ %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 -/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : +%{_bindir}/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : %postun /sbin/ldconfig -/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : +%{_bindir}/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : %post author -p /sbin/ldconfig @@ -497,11 +504,11 @@ %post krita /sbin/ldconfig -/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : +%{_bindir}/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : %postun krita /sbin/ldconfig -/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : +%{_bindir}/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : %post plan -p /sbin/ldconfig ++++++ calligra-2.8.5-librevenge.patch ++++++ ++++ 794 lines (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
