Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2014-07-10 14:55:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-17 21:47:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2014-07-10 14:56:27.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jul 4 17:09:03 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 2.8.5 + * Bugfix release, no upstream changelog provided + +------------------------------------------------------------------- +Wed Jul 2 08:58:34 UTC 2014 - ctri...@opensuse.org + +- Build kexi postgresl driver again (bnc#882459) as the upstream bug + (kde#300871) which caused the disable was fixed. +- Removed checks for old suse versions in the spec file + +------------------------------------------------------------------- Old: ---- calligra-2.8.3.tar.xz New: ---- calligra-2.8.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.mOCfU0/_old 2014-07-10 14:56:32.000000000 +0200 +++ /var/tmp/diff_new_pack.mOCfU0/_new 2014-07-10 14:56:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: calligra -Version: 2.8.3 +Version: 2.8.5 Release: 0 Summary: Libraries and Base Files for the KDE Office Suite License: GPL-2.0+ and LGPL-2.1+ and GFDL-1.2 @@ -46,17 +46,11 @@ BuildRequires: libmysqld-devel BuildRequires: libodfgen-devel BuildRequires: libpoppler-qt4-devel -# Kexi doesn't support libpqxx >= 4, for details see https://bugs.kde.org/show_bug.cgi?id=300871 -%if 0%{?suse_version} < 1310 BuildRequires: libpqxx-devel -BuildRequires: postgresql-devel -%endif BuildRequires: libqca2-devel BuildRequires: librcps-devel BuildRequires: libspnav-devel -%if 0%{?suse_version} > 1220 BuildRequires: libvisio-devel -%endif BuildRequires: libwpd-devel BuildRequires: libwpg-devel BuildRequires: libwps-devel @@ -64,6 +58,7 @@ BuildRequires: mysql-devel BuildRequires: okular-devel BuildRequires: openjpeg-devel +BuildRequires: postgresql-devel BuildRequires: pstoedit BuildRequires: sqlite-devel BuildRequires: xbase-devel @@ -91,11 +86,6 @@ Obsoletes: koffice2 < %{version} Obsoletes: koffice2-kformula < %{version} Obsoletes: koffice2-kthesaurus < %{version} -# Kexi doesn't support libpqxx >= 4, for details see https://bugs.kde.org/show_bug.cgi?id=300871 -# so the kexi-postgresql-driver package is dropped with 13.1 -%if 0%{?suse_version} > 1230 -Obsoletes: kexi-postgresql-driver < %{version} -%endif %kde4_runtime_requires %kde4_pimlibs_requires Requires(post): shared-mime-info @@ -199,9 +189,7 @@ Recommends: kexi-sqlite3-driver Suggests: kexi-mssql-driver Suggests: kexi-mysql-driver -%if 0%{?suse_version} < 1310 Suggests: kexi-postgresql-driver -%endif Suggests: kexi-spreadsheet-import Suggests: kexi-xbase-driver # koffice2 was last used at version 2.3.1 in openSUSE 12.1 @@ -233,7 +221,6 @@ This package contains Kexi MySQL driver. -%if 0%{?suse_version} < 1310 %package kexi-postgresql-driver Summary: Database Application - PostgreSQL driver License: GPL-2.0+ and LGPL-2.1+ @@ -244,7 +231,6 @@ Kexi is the database application of the Calligra Suite. This package contains Kexi PostgreSQL driver. -%endif %package kexi-spreadsheet-import Summary: Spreadsheet-to-Kexi-table import plugin @@ -614,10 +600,8 @@ # Included in kexi-*-driver packages %exclude %{_kde4_modulesdir}/kexi*_mysql*.so %exclude %{_kde4_servicesdir}/kexi*_mysql*.desktop -%if 0%{?suse_version} < 1310 %exclude %{_kde4_modulesdir}/kexi*_pqxx*.so %exclude %{_kde4_servicesdir}/kexi*_pqxx*.desktop -%endif %exclude %{_kde4_modulesdir}/kexi*_sqlite3*.so %exclude %{_kde4_servicesdir}/kexi*_sqlite3*.desktop %exclude %{_kde4_modulesdir}/kexi*_sybase*.so @@ -641,14 +625,12 @@ %{_kde4_servicesdir}/kexidb_mysqldriver.desktop %{_kde4_servicesdir}/keximigrate_mysql.desktop -%if 0%{?suse_version} < 1310 %files kexi-postgresql-driver %defattr(-,root,root,-) %{_kde4_modulesdir}/kexidb_pqxxsqldriver.so %{_kde4_modulesdir}/keximigrate_pqxx.so %{_kde4_servicesdir}/kexidb_pqxxsqldriver.desktop %{_kde4_servicesdir}/keximigrate_pqxx.desktop -%endif %files kexi-spreadsheet-import %defattr(-,root,root,-) ++++++ calligra-2.8.3.tar.xz -> calligra-2.8.5.tar.xz ++++++ /work/SRC/openSUSE:Factory/calligra/calligra-2.8.3.tar.xz /work/SRC/openSUSE:Factory/.calligra.new/calligra-2.8.5.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
