Hello community, here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2016-04-12 19:24:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old) and /work/SRC/openSUSE:Factory/.kpeople5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5" Changes: -------- --- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2016-03-16 10:31:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kpeople5.new/kpeople5.changes 2016-04-12 19:24:08.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Apr 4 14:22:04 UTC 2016 - hrvoje.sen...@gmail.com + +- Update to 5.21.0 (boo#974793) + * Set the contact uri as person uri in PersonData when + no person exists + * Set a name for the database connection + * Upgrade Qt version requirement to 5.4.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.21.0.php + +------------------------------------------------------------------- Old: ---- kpeople-5.20.0.tar.xz New: ---- kpeople-5.21.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpeople5.spec ++++++ --- /var/tmp/diff_new_pack.3h4CyO/_old 2016-04-12 19:24:08.000000000 +0200 +++ /var/tmp/diff_new_pack.3h4CyO/_new 2016-04-12 19:24:08.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define rname kpeople -%define _tar_path 5.20 +%define _tar_path 5.21 Name: kpeople5 -Version: 5.20.0 +Version: 5.21.0 Release: 0 %define kf5_version %{version} BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -30,12 +30,12 @@ BuildRequires: kitemviews-devel >= %{_tar_path} BuildRequires: kservice-devel >= %{_tar_path} BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: cmake(Qt5DBus) >= 5.3.0 -BuildRequires: cmake(Qt5Gui) >= 5.3.0 -BuildRequires: cmake(Qt5Qml) >= 5.3.0 -BuildRequires: cmake(Qt5Sql) >= 5.3.0 -BuildRequires: cmake(Qt5Test) >= 5.3.0 -BuildRequires: cmake(Qt5Widgets) >= 5.3.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Gui) >= 5.4.0 +BuildRequires: cmake(Qt5Qml) >= 5.4.0 +BuildRequires: cmake(Qt5Sql) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 %if %{with lang} Recommends: %{name}-lang %endif @@ -54,7 +54,7 @@ Summary: Provides access to all contacts and the people who hold them Group: Development/Libraries/KDE Requires: %{name} = %{version} -Requires: cmake(Qt5Core) >= 5.3.0 +Requires: cmake(Qt5Core) >= 5.4.0 %description devel A library that provides access to all contacts and the people who hold them. ++++++ kpeople-5.20.0.tar.xz -> kpeople-5.21.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.20.0/CMakeLists.txt new/kpeople-5.21.0/CMakeLists.txt --- old/kpeople-5.20.0/CMakeLists.txt 2016-03-06 15:40:39.000000000 +0100 +++ new/kpeople-5.21.0/CMakeLists.txt 2016-04-03 23:00:35.000000000 +0200 @@ -3,16 +3,16 @@ project (KPeople) include(FeatureSummary) -find_package(ECM 5.20.0 NO_MODULE) +find_package(ECM 5.21.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -set(KF5_VERSION "5.20.0") # handled by release scripts -set(KF5_DEP_VERSION "5.20.0") # handled by release scripts +set(KF5_VERSION "5.21.0") # handled by release scripts +set(KF5_DEP_VERSION "5.21.0") # handled by release scripts -set(REQUIRED_QT_VERSION 5.3.0) +set(REQUIRED_QT_VERSION 5.4.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Sql DBus Widgets Qml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.20.0/autotests/persondatatests.cpp new/kpeople-5.21.0/autotests/persondatatests.cpp --- old/kpeople-5.20.0/autotests/persondatatests.cpp 2016-03-06 15:40:39.000000000 +0100 +++ new/kpeople-5.21.0/autotests/persondatatests.cpp 2016-04-03 23:00:35.000000000 +0200 @@ -73,12 +73,14 @@ void PersonDataTests::loadContact() { - PersonData person(QStringLiteral("fakesource://contact1")); + QString personUri = QStringLiteral("fakesource://contact1"); + PersonData person(personUri); //in this case we know the datasource is synchronous, but we should extend the test to cope with it not being async. QCOMPARE(person.contactUris().size(), 1); QCOMPARE(person.name(), QStringLiteral("Contact 1")); QCOMPARE(person.allEmails(), QStringList(QStringLiteral("conta...@example.com"))); + QCOMPARE(person.personUri(), personUri); } void PersonDataTests::loadPerson() @@ -90,6 +92,7 @@ QCOMPARE(person.contactUris().size(), 2); QCOMPARE(person.name(), QStringLiteral("Contact 2")); QCOMPARE(person.allEmails().size(), 2); + QCOMPARE(person.personUri(), QStringLiteral("kpeople://1")); //convert to set as order is not important QCOMPARE(person.allEmails().toSet(), QSet<QString>() << QStringLiteral("conta...@example.com") << QStringLiteral("conta...@example.com")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.20.0/src/persondata.cpp new/kpeople-5.21.0/src/persondata.cpp --- old/kpeople-5.20.0/src/persondata.cpp 2016-03-06 15:40:39.000000000 +0100 +++ new/kpeople-5.21.0/src/persondata.cpp 2016-04-03 23:00:35.000000000 +0200 @@ -85,7 +85,11 @@ qWarning() << "error: creating PersonData for unknown contact" << contactUri << id; } - d->metaContact = MetaContact(personUri, contacts); + if (personUri.isEmpty() && contacts.size() == 1) { + d->metaContact = MetaContact(id, contacts.first()); + } else { + d->metaContact = MetaContact(personUri, contacts); + } } PersonData::~PersonData() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.20.0/src/personmanager.cpp new/kpeople-5.21.0/src/personmanager.cpp --- old/kpeople-5.20.0/src/personmanager.cpp 2016-03-06 15:40:39.000000000 +0100 +++ new/kpeople-5.21.0/src/personmanager.cpp 2016-04-03 23:00:35.000000000 +0200 @@ -61,7 +61,7 @@ PersonManager::PersonManager(const QString &databasePath, QObject *parent): QObject(parent), - m_db(QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"))) + m_db(QSqlDatabase::addDatabase(QStringLiteral("QSQLITE"), QStringLiteral("kpeoplePersonsManager"))) { m_db.setDatabaseName(databasePath); if (!m_db.open()) {
