Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2012-10-03 07:05:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra (Old) and /work/SRC/openSUSE:Factory/.calligra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/calligra/calligra-doc.changes 2012-09-20 14:57:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra-doc.changes 2012-10-03 07:05:55.000000000 +0200 @@ -1,0 +2,62 @@ +Sun Sep 23 21:41:16 UTC 2012 - nico.kru...@gmail.com + +- merged package from KR49: + * update to calligra 2.5.2 (raba...@opensuse.org) + - Sheets: + * Fixed bug that prevented plugins from showing on + Settings->Configure Sheets…->Plugins page (bug 291343) + - Stage: + * Fixed display of shapes in the document docker + * Fix unwanted offset after cancel slideshow (bug 306118) + - Kexi: + * Fixed bug in Query Designer: removed SQL Editor’s history + as it was not functional (bug 306145) + * Make string concatenation operator || work in + Query Designer (bug 305793) + * Startup GUI: fetch startup UI definition from x.y.0 URL + for any x.y.z version, not from x.y.z URL + * Buildsystem: make it possible to disable database drivers + even if their dependencies are present and found + (wish 305683) + - Common: + * Fix resizing of horizontal and vertical lines (bug 306133) + * Fix reordering of shapes (bug 306309) + * Fix some icons for the formula shape. + * Trigger repaint of the picture shape after insertion + (bug 305548) + * Fix some corner cases when loading borders + * removed bnc733534-calligra-msword-overflow-fix.diff; + fixed upstream (nico.kru...@gmail.com) + * update to 2.5.1 (raba...@opensuse.org) + - Words: + * Fix: crash when saving file with imported text (bug 298899) + * Do not save with an attribue that makes LibreOffice and + OpenOffice crash (BUG: 298689 ) + - Kexi: + * Workaround for visual glitch of Oxygen style for menu widget + in kexi (bug 305051) + * Fix crash on importing CSV files with more than 1024 columns + (bug 304405) and with Mac line endings (bug 304329) + - Krita: + * Make it possible to open Krita 2.5 documents in 2.4 if no + composition was set. + * Fix: conversion of HDR colorspaces + * Fix: crash when merging down the top layer if there is a + selection (bug 305465) + - Common: + * Fix: Uncompressed ODF is saved in wrong directory (bug 305794) + * Don’t mirror an image with a width of one pixel or less + (bug 166324) + * update to 2.5 (nico.kru...@gmail.com) + - See http://www.calligra.org/news/calligra-2-5-released/ + * Fix remaining build errors (toddrme2...@gmail.com) + * Update to 2.5 RC 1 (2.4.92) (toddrme2...@gmail.com) + - See http://www.calligra.org/news/calligra-2-5-release-candidate/ +- removed calligra-marblewidget.patch; fixed upstream + +------------------------------------------------------------------- +Fri Sep 21 09:17:09 UTC 2012 - idon...@suse.com + +- Add explicit glu dependency + +------------------------------------------------------------------- calligra.changes: same change Old: ---- bnc733534-calligra-msword-overflow-fix.diff calligra-2.4.3.tar.bz2 calligra-marblewidget.patch New: ---- calligra-2.5.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra-doc.spec ++++++ --- /var/tmp/diff_new_pack.R2bkEw/_old 2012-10-03 07:06:06.000000000 +0200 +++ /var/tmp/diff_new_pack.R2bkEw/_new 2012-10-03 07:06:06.000000000 +0200 @@ -17,13 +17,13 @@ Name: calligra-doc -Version: 2.4.3 +Version: 2.5.2 Release: 0 Summary: Documentation of the Calligra Suite License: GFDL-1.2 Group: Documentation/HTML Url: http://www.calligra.org/ -Source0: ftp://ftp.kde.org/pub/kde/unstable/calligra-%{version}/calligra-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-%{version}.tar.bz2 BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel %if 0%{?suse_version} > 1210 @@ -104,6 +104,5 @@ %doc %lang(en) %{_kde4_htmldir}/en/kexi/ %doc %lang(en) %{_kde4_htmldir}/en/sheets/ %doc %lang(en) %{_kde4_htmldir}/en/stage/ -%doc %lang(en) %{_kde4_htmldir}/en/thesaurus/ %changelog ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.R2bkEw/_old 2012-10-03 07:06:06.000000000 +0200 +++ /var/tmp/diff_new_pack.R2bkEw/_new 2012-10-03 07:06:06.000000000 +0200 @@ -17,14 +17,14 @@ Name: calligra -Version: 2.4.3 +Version: 2.5.2 Release: 0 Summary: Libraries and Base Files for the Calligra Suite License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Url: http://www.calligra.org/ Source0: %{name}-%{version}.tar.bz2 -#Source0: ftp://ftp.kde.org/pub/kde/unstable/%{name}-%{version}/%{name}-%{version}.tar.bz2 +#Source0: ftp://ftp.kde.org/pub/kde/stable/%{name}-%{version}/%{name}-%{version}.tar.bz2 Source1: hi16-app-kexi.png Source2: hi22-app-kexi.png Source3: hi32-app-kexi.png @@ -32,8 +32,6 @@ Source5: hisc-app-kexi.svgz # PATCH-FIX-OPENSUSE remove_python_shebangs.patch asterios.dra...@gmail.com -- Remove python shebangs from various scripts (fixes rpmlint warning "non-executable-script") Patch0: remove_python_shebangs.patch -Patch1: bnc733534-calligra-msword-overflow-fix.diff -Patch2: calligra-marblewidget.patch BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel %if 0%{?suse_version} > 1210 @@ -59,9 +57,7 @@ BuildRequires: libkdcraw-devel BuildRequires: libkdepimlibs4-devel BuildRequires: liblcms-devel -%if 0%{?suse_version} > 1130 BuildRequires: liblcms2-devel -%endif BuildRequires: libmysqld-devel BuildRequires: libpoppler-qt4-devel BuildRequires: libpqxx-devel @@ -85,26 +81,29 @@ BuildRequires: pstoedit BuildRequires: sqlite-devel BuildRequires: xbase-devel -Recommends: kdepim4-runtime +BuildRequires: pkgconfig(glu) Recommends: %{name}-doc = %{version} +Recommends: kdepim4-runtime Suggests: calligra-braindump Suggests: calligra-flow Suggests: calligra-karbon Suggests: calligra-kexi Suggests: calligra-krita -Suggests: calligra-kthesaurus Suggests: calligra-plan -Suggests: calligra-stage Suggests: calligra-sheets +Suggests: calligra-stage Suggests: calligra-words +# calligra-kformula was last used at version 2.3.73 in KDE:Unstable:Playground +Provides: calligra-kformula = %{version} +Obsoletes: calligra-kformula < %{version} +# calligra-kthesaurus was last used at version 2.3.73 in KDE:Release:49 +Provides: calligra-kthesaurus = %{version} +Obsoletes: calligra-kthesaurus < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires Requires(post): shared-mime-info Requires(postun): shared-mime-info -# calligra-kformula was last used at version 2.3.73 in KDE:Unstable:Playground -Provides: calligra-kformula = %{version} -Obsoletes: calligra-kformula < %{version} %description The Calligra Suite is a set of applications that allows you to easily complete @@ -183,8 +182,6 @@ %description kexi Kexi is the database application of the Calligra Suite. -%if 0%{?suse_version} > 1140 - %package kexi-mssql-driver Summary: Database Application - MS SQL & Sybase Server driver License: GPL-2.0+ and LGPL-2.1+ @@ -195,7 +192,6 @@ Kexi is the database application of the Calligra Suite. This package contains Kexi MS SQL & Sybase Server driver. -%endif %package kexi-mysql-driver Summary: Database Application - MySQL driver @@ -246,25 +242,14 @@ License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Suite Requires: %{name} = %{version} +Recommends: create-resources Requires(post): shared-mime-info Requires(postun): shared-mime-info -Recommends: create-resources %kde4_runtime_requires %description krita Krita is the image manipulation application of the Calligra Suite. -%package kthesaurus -Summary: Related Words Lookup -License: GPL-2.0+ and LGPL-2.1+ -Group: Productivity/Office/Suite -Requires: %{name} = %{version} -%kde4_runtime_requires - -%description kthesaurus -KThesaurus is the related words lookup application of the Calligra office -suite. - %package plan Summary: Project Management Application License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ @@ -319,8 +304,6 @@ %prep %setup -q %patch0 -%patch1 -p1 -%patch2 -p1 %build %cmake_kde4 -d build -- -DBUILD_mobile=false -DBUILD_active=false -DIHAVEPATCHEDQT=TRUE @@ -356,8 +339,8 @@ rm -rf %{buildroot}%{_kde4_htmldir}/en/ # Do not use fdupes in %%{buildroot} as this causes icons in the calligra-package to be symlinks against the kexi-package, so that these are missing in krita (bnc#688012) -%fdupes -s %{buildroot}%{_datadir}/color/icc/krita/ -%fdupes -s %{buildroot}%{_datadir}/locale/ +%fdupes -s %{buildroot}%{_kde4_datadir}/color/icc/krita/ +%fdupes -s %{buildroot}%{_kde4_datadir}/locale/ %fdupes -s %{buildroot}%{_kde4_appsdir}/calligra/ %fdupes -s %{buildroot}%{_kde4_appsdir}/flow/stencils/ %fdupes -s %{buildroot}%{_kde4_appsdir}/kexi/ @@ -370,7 +353,6 @@ %suse_update_desktop_file -r karbon Qt KDE Graphics VectorGraphics %suse_update_desktop_file -r kexi Qt KDE Office Database %suse_update_desktop_file -r krita Qt KDE Graphics RasterGraphics -%suse_update_desktop_file -r KThesaurus Qt KDE Office Dictionary %suse_update_desktop_file -r plan Qt KDE Office ProjectManagement %suse_update_desktop_file -r planwork Qt KDE Office ProjectManagement %suse_update_desktop_file -r stage Qt KDE Office Presentation @@ -383,7 +365,6 @@ for i in {16,32,48,64}; do mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps cp -a %{_kde4_iconsdir}/oxygen/"$i"x"$i"/apps/kivio.png %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps/; - cp -a %{_kde4_iconsdir}/oxygen/"$i"x"$i"/apps/kthesaurus.png %{buildroot}%{_kde4_iconsdir}/hicolor/"$i"x"$i"/apps/; done # Install hicolor application icons for kexi for i in {16,22,32,48}; do @@ -398,11 +379,19 @@ %post /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : %postun /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : + +%post krita +/sbin/ldconfig +/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : + +%postun krita +/sbin/ldconfig +/usr/bin/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : %post braindump -p /sbin/ldconfig @@ -420,14 +409,6 @@ %postun kexi -p /sbin/ldconfig -%post krita -/sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : - -%postun krita -/sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : - %post plan -p /sbin/ldconfig %postun plan -p /sbin/ldconfig @@ -451,12 +432,12 @@ %files -f filelists/exclude %defattr(-,root,root,-) %doc COPYING COPYING.LIB README -%dir %{_datadir}/color -%dir %{_datadir}/color/icc +%dir %{_kde4_datadir}/color +%dir %{_kde4_datadir}/color/icc %dir %{_kde4_sharedir}/templates %dir %{_kde4_sharedir}/templates/.source -%{_datadir}/color/icc/pigment/ -%{_datadir}/mime/packages/msooxml-all.xml +%{_kde4_datadir}/color/icc/pigment/ +%{_kde4_datadir}/mime/packages/msooxml-all.xml %{_kde4_applicationsdir}/calligra.desktop %{_kde4_appsdir}/calligra/ %{_kde4_appsdir}/formulashape/ @@ -471,7 +452,10 @@ %dir %{_kde4_appsdir}/pigmentcms/ctlprofiles %dir %{_kde4_appsdir}/pigmentcms/ctltemplates %endif -%{_kde4_appsdir}/xsltfilter/ +%{_kde4_iconsdir}/oxygen/*/actions/curve-connector.* +%{_kde4_iconsdir}/oxygen/*/actions/insert-endnote.* +%{_kde4_iconsdir}/oxygen/*/actions/insert-footnote.* +%{_kde4_iconsdir}/oxygen/*/actions/lines-connector.* %{_kde4_iconsdir}/oxygen/*/actions/object-align-horizontal-center-calligra.* %{_kde4_iconsdir}/oxygen/*/actions/object-align-horizontal-left-calligra.* %{_kde4_iconsdir}/oxygen/*/actions/object-align-horizontal-right-calligra.* @@ -486,6 +470,8 @@ %{_kde4_iconsdir}/oxygen/*/actions/object-order-raise-calligra.* %{_kde4_iconsdir}/oxygen/*/actions/object-ungroup-calligra.* %{_kde4_iconsdir}/oxygen/*/actions/shape-choose.* +%{_kde4_iconsdir}/oxygen/*/actions/standard-connector.* +%{_kde4_iconsdir}/oxygen/*/actions/straight-connector.* %{_kde4_iconsdir}/oxygen/*/actions/table.* %{_kde4_iconsdir}/oxygen/*/actions/x-shape-chart.* %{_kde4_iconsdir}/oxygen/*/actions/x-shape-connection.* @@ -515,19 +501,15 @@ %{_kde4_modulesdir}/autocorrect.so %{_kde4_modulesdir}/calligradockers.so %{_kde4_modulesdir}/calligragoogledocs.so -%{_kde4_modulesdir}/calligrascan.so %{_kde4_modulesdir}/changecase.so %{_kde4_modulesdir}/chartshape.so %{_kde4_modulesdir}/commentshape.so %{_kde4_modulesdir}/defaulttools.so %{_kde4_modulesdir}/formulashape.so -%{_kde4_modulesdir}/generickofilter.so %{_kde4_modulesdir}/kodocinfopropspage.so %{_kde4_modulesdir}/kolcmsengine.so %{_kde4_modulesdir}/kopabackgroundtool.so %{_kde4_modulesdir}/koreport_*.so -%{_kde4_modulesdir}/kounavailpart.so -# %%{_kde4_modulesdir}/mapshape.so %{_kde4_modulesdir}/musicshape.so %{_kde4_modulesdir}/pathshapes.so %{_kde4_modulesdir}/pictureshape.so @@ -538,11 +520,9 @@ %{_kde4_modulesdir}/spellcheck.so %{_kde4_modulesdir}/textshape.so %{_kde4_modulesdir}/textvariables.so -%{_kde4_modulesdir}/treeshape.so +%{_kde4_modulesdir}/thesaurustool.so %{_kde4_modulesdir}/vectorshape.so %{_kde4_modulesdir}/videoshape.so -%{_kde4_modulesdir}/xsltexport.so -%{_kde4_modulesdir}/xsltimport.so %{_kde4_servicesdir}/artistictextshape.desktop %{_kde4_servicesdir}/autocorrect.desktop %{_kde4_servicesdir}/calligradockers.desktop @@ -551,7 +531,6 @@ %{_kde4_servicesdir}/commentshape.desktop %{_kde4_servicesdir}/defaulttools.desktop %{_kde4_servicesdir}/formulashape.desktop -%{_kde4_servicesdir}/generic_filter.desktop %{_kde4_servicesdir}/kchartpart.desktop %{_kde4_servicesdir}/kformulapart.desktop %{_kde4_servicesdir}/kodocinfopropspage.desktop @@ -561,8 +540,6 @@ %{_kde4_servicesdir}/koreport_chartplugin.desktop %{_kde4_servicesdir}/koreport_mapsplugin.desktop %{_kde4_servicesdir}/koreport_webplugin.desktop -%{_kde4_servicesdir}/kounavail.desktop -# %%{_kde4_servicesdir}/mapshape.desktop %{_kde4_servicesdir}/musicshape.desktop %{_kde4_servicesdir}/pathshapes.desktop %{_kde4_servicesdir}/pictureshape.desktop @@ -573,11 +550,9 @@ %{_kde4_servicesdir}/spellcheck.desktop %{_kde4_servicesdir}/textshape.desktop %{_kde4_servicesdir}/textvariables.desktop -%{_kde4_servicesdir}/treeshape.desktop +%{_kde4_servicesdir}/thesaurustool.desktop %{_kde4_servicesdir}/vectorshape.desktop %{_kde4_servicesdir}/videoshape.desktop -%{_kde4_servicesdir}/xslt_export.desktop -%{_kde4_servicesdir}/xslt_import.desktop %{_kde4_servicetypesdir}/calligra_application.desktop %{_kde4_servicetypesdir}/calligra_deferred_plugin.desktop %{_kde4_servicetypesdir}/calligradocker.desktop @@ -599,14 +574,6 @@ %{_kde4_servicetypesdir}/scripteventaction.desktop %{_kde4_servicetypesdir}/texteditingplugin.desktop %{_kde4_servicetypesdir}/textvariableplugin.desktop -# Included in kthesaurus package -%exclude %{_kde4_appsdir}/calligra/thesaurus/ - -%files braindump -f filelists/braindump -%defattr(-,root,root,-) -%doc braindump/COPYING -%dir %{_kde4_appsdir}/stateshape/ -%dir %{_kde4_appsdir}/stateshape/states %files devel -f filelists/devel %defattr(-,root,root,-) @@ -632,6 +599,12 @@ %{_kde4_libdir}/libpigmentcms.so %{_kde4_libdir}/libtextlayout.so +%files braindump -f filelists/braindump +%defattr(-,root,root,-) +%doc braindump/COPYING +%dir %{_kde4_appsdir}/stateshape/ +%dir %{_kde4_appsdir}/stateshape/states + %files flow -f filelists/flow %defattr(-,root,root,-) %doc flow/AUTHORS flow/CHANGELOG flow/CHANGES flow/LICENSE flow/NOTES flow/README @@ -641,8 +614,8 @@ %defattr(-,root,root,-) %doc karbon/AUTHORS karbon/CHANGES karbon/COPYING.LIB karbon/IDEAS karbon/README karbon/TODO %{_kde4_servicesdir}/ServiceMenus/karbon_konqi.desktop -%{_kde4_sharedir}/templates/.source/Illustration.karbon %{_kde4_sharedir}/templates/Illustration.desktop +%{_kde4_sharedir}/templates/.source/Illustration.odg %files kexi -f filelists/kexi %defattr(-,root,root,-) @@ -701,23 +674,11 @@ %files krita -f filelists/krita %defattr(-,root,root,-) %doc krita/AUTHORS krita/README -%dir %{_datadir}/color/icc/krita/ +%dir %{_kde4_datadir}/color/icc/krita/ %dir %{_kde4_appsdir}/kritaplugins/ %dir %{_kde4_appsdir}/kritaplugins/metadataeditor -%{_kde4_appsdir}/krita/kpartplugins/ %{_kde4_servicesdir}/ServiceMenus/krita_konqi.desktop -%files kthesaurus -%defattr(-,root,root,-) -%doc tools/kthesaurus/README -%{_kde4_applicationsdir}/KThesaurus.desktop -%{_kde4_appsdir}/calligra/thesaurus/ -%{_kde4_bindir}/kthesaurus -%{_kde4_iconsdir}/hicolor/*/apps/kthesaurus.* -%{_kde4_libdir}/libkdeinit4_kthesaurus.so -%{_kde4_modulesdir}/thesaurustool.so -%{_kde4_servicesdir}/thesaurustool.desktop - %files plan -f filelists/plan %defattr(-,root,root,-) %doc plan/CHANGELOG plan/TODO plan/examples/ @@ -730,22 +691,20 @@ %doc stage/AUTHORS stage/CHANGES stage/TODO %{_kde4_appsdir}/stage/kpartplugins/ %{_kde4_servicesdir}/ServiceMenus/kpresenter_konqi.desktop -%{_kde4_sharedir}/templates/.source/Presentation.kpt %{_kde4_sharedir}/templates/Presentation.desktop +%{_kde4_sharedir}/templates/.source/Presentation.odp %files sheets -f filelists/sheets %defattr(-,root,root,-) %doc sheets/AUTHORS sheets/CHANGES sheets/README sheets/TODO -%{_kde4_sharedir}/templates/SpreadSheet.desktop -%{_kde4_sharedir}/templates/.source/SpreadSheet.kst +%{_kde4_appsdir}/tables/ +%{_kde4_appsdir}/tables/kpartplugins/ %{_kde4_servicesdir}/ServiceMenus/kspread_konqi.desktop +%{_kde4_sharedir}/templates/SpreadSheet.desktop +%{_kde4_sharedir}/templates/.source/SpreadSheet.ods %files tools -f filelists/tools %defattr(-,root,root,-) -# Included in kthesaurus package -%exclude %{_kde4_applicationsdir}/KThesaurus.desktop -%exclude %{_kde4_bindir}/kthesaurus -%exclude %{_kde4_libdir}/libkdeinit4_kthesaurus.so # Included in karbon, stage, krita, sheets, words packages %exclude %{_kde4_servicesdir}/ServiceMenus/karbon_konqi.desktop %exclude %{_kde4_servicesdir}/ServiceMenus/kpresenter_konqi.desktop @@ -758,7 +717,7 @@ %dir %{_kde4_appsdir}/words/html-odf %{_kde4_appsdir}/words/kpartplugins/ %{_kde4_servicesdir}/ServiceMenus/words_konqi.desktop -%{_kde4_sharedir}/templates/.source/TextDocument.kwt %{_kde4_sharedir}/templates/TextDocument.desktop +%{_kde4_sharedir}/templates/.source/TextDocument.odt %changelog ++++++ calligra-2.4.3.tar.bz2 -> calligra-2.5.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/calligra/calligra-2.4.3.tar.bz2 /work/SRC/openSUSE:Factory/.calligra.new/calligra-2.5.2.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
