Hello community, here is the log from the commit of package koffice2 for openSUSE:Factory checked in at Wed Dec 29 00:10:07 CET 2010. -------- --- KDE/koffice2/koffice2-doc.changes 2010-12-14 11:41:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/koffice2/koffice2-doc.changes 2010-12-29 00:09:32.285077000 +0100 @@ -1,0 +2,15 @@ +Tue Dec 21 13:33:53 UTC 2010 - coolo@novell.com + +- libexif got split + +------------------------------------------------------------------- +Wed Dec 15 21:06:44 UTC 2010 - tittiatcoke@gmail.com + +- Added lcms2 as dependency for Factory + +------------------------------------------------------------------- +Tue Dec 14 19:34:16 UTC 2010 - tittiatcoke@gmail.com + +- Added an patch from upstream to prevent a crash (bko#259262) + +------------------------------------------------------------------- koffice2.changes: same change calling whatdependson for head-i586 New: ---- kis_preference_set_registry.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice2-doc.spec ++++++ --- /var/tmp/diff_new_pack.4QfIgI/_old 2010-12-29 00:09:51.000000000 +0100 +++ /var/tmp/diff_new_pack.4QfIgI/_new 2010-12-29 00:09:51.000000000 +0100 @@ -27,7 +27,7 @@ Summary: Documentation of the KDE Office Suite Url: http://www.koffice.org Version: 2.2.91 -Release: 1 +Release: 2 Source0: koffice-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ koffice2.spec ++++++ --- /var/tmp/diff_new_pack.4QfIgI/_old 2010-12-29 00:09:51.000000000 +0100 +++ /var/tmp/diff_new_pack.4QfIgI/_new 2010-12-29 00:09:51.000000000 +0100 @@ -18,7 +18,7 @@ Name: koffice2 -BuildRequires: ImageMagick-devel OpenEXR-devel aspell-devel doxygen graphviz libexif libkdepimlibs4-devel +BuildRequires: ImageMagick-devel OpenEXR-devel aspell-devel doxygen graphviz libkdepimlibs4-devel BuildRequires: libpoppler-qt4-devel libpqxx-devel libqt4-devel-doc-data mysql-devel postgresql-devel python-devel BuildRequires: GraphicsMagick-devel gsl-devel libwpd-devel readline-devel ruby-devel sqlite-devel wv2-devel BuildRequires: glew-devel libeigen2-devel libexiv2-devel libgmm++-devel libqca2-devel libqimageblitz-devel pstoedit @@ -30,12 +30,18 @@ BuildRequires: libqtgtl-devel opengtl-devel %endif %endif +%if %suse_version > 1130 +BuildRequires: libexif-devel +BuildRequires: liblcms2-devel +%else +BuildRequires: libexif +%endif License: GPLv2+ ; LGPLv2.1+ Group: Productivity/Office/Suite Summary: Libraries and Base Files for the KDE Office Suite Url: http://www.koffice.org Version: 2.2.91 -Release: 1 +Release: 2 Source0: koffice-%version.tar.bz2 Source1: hi16-app-kexi.png Source2: hi22-app-kexi.png @@ -43,6 +49,7 @@ Source4: hi48-app-kexi.png Source5: hisc-app-kexi.svgz Patch2: koffice_remove_python_shebangs.diff +Patch3: kis_preference_set_registry.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -70,6 +77,7 @@ %prep %setup -q -n koffice-%version %patch2 +%patch3 -p1 cp %SOURCE1 kexi/pics cp %SOURCE2 kexi/pics ++++++ kis_preference_set_registry.patch ++++++ --- koffice/krita/ui/kis_preference_set_registry.cpp 2010/12/03 21:04:19 1203400 +++ koffice/krita/ui/kis_preference_set_registry.cpp 2010/12/14 17:35:43 1206503 @@ -25,9 +25,9 @@ KisPreferenceSetRegistry ::~KisPreferenceSetRegistry () { - foreach(QString id, keys()) { - delete get(id); - } +// foreach(QString id, keys()) { +// delete get(id); +// } dbgRegistry << "deleting KisPreferenceSetRegistry "; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org