Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2013-05-16 15:24:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-04-24 09:25:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2013-05-16 15:24:15.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 4 20:59:05 UTC 2013 - hrvoje.sen...@gmail.com + +- Drop and obsolete kexi-postgresql-driver package for 13.1, as kexi + doesn't support libpqxx >= 4 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.fjdcFG/_old 2013-05-16 15:24:18.000000000 +0200 +++ /var/tmp/diff_new_pack.fjdcFG/_new 2013-05-16 15:24:18.000000000 +0200 @@ -49,7 +49,11 @@ BuildRequires: liblcms2-devel BuildRequires: libmysqld-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: libsoprano-devel @@ -67,7 +71,6 @@ %if 0%{?suse_version} > 1210 BuildRequires: openjpeg-devel %endif -BuildRequires: postgresql-devel BuildRequires: pstoedit BuildRequires: sqlite-devel BuildRequires: xbase-devel @@ -95,6 +98,11 @@ 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 @@ -198,7 +206,9 @@ 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 @@ -230,6 +240,7 @@ 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+ @@ -240,6 +251,7 @@ 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 @@ -695,8 +707,10 @@ # 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 @@ -718,12 +732,14 @@ %{_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,-) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org