Hello community, here is the log from the commit of package baloo5 for openSUSE:Factory checked in at 2015-05-11 19:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/baloo5 (Old) and /work/SRC/openSUSE:Factory/.baloo5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "baloo5" Changes: -------- --- /work/SRC/openSUSE:Factory/baloo5/baloo5.changes 2015-03-25 09:56:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.baloo5.new/baloo5.changes 2015-05-11 19:32:54.000000000 +0200 @@ -1,0 +2,26 @@ +Sat May 2 00:53:37 UTC 2015 - [email protected] + +- Added 0001-Revert-BasicIndexingQueue-Use-xapian-slots-to-fetch-.patch + from upstream + +------------------------------------------------------------------- +Thu Apr 23 13:27:15 UTC 2015 - [email protected] + +- Update to 5.3 Final: + * For more details please see: + https://www.kde.org/announcements/plasma-5.3.0.php +- Let file and tools subpackages Obsolete KDE4 variants for + openSUSE > 13.2 + +------------------------------------------------------------------- +Sat Apr 11 18:53:29 UTC 2015 - [email protected] + +- Update to 5.2.95 aka 5.3 beta: + * New feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.2.95.php +- Update required Qt version to 5.4.0 +- Raise required extra-cmake-modules version to 1.2.0 +- Added kdbusaddons-devel BuildRequires + +------------------------------------------------------------------- Old: ---- baloo-5.6.2.tar.xz New: ---- 0001-Revert-BasicIndexingQueue-Use-xapian-slots-to-fetch-.patch baloo-5.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baloo5.spec ++++++ --- /var/tmp/diff_new_pack.tKzGhu/_old 2015-05-11 19:32:55.000000000 +0200 +++ /var/tmp/diff_new_pack.tKzGhu/_new 2015-05-11 19:32:55.000000000 +0200 @@ -16,8 +16,9 @@ # +%bcond_without lang Name: baloo5 -Version: 5.6.2 +Version: 5.9.0 Release: 0 Summary: Framework for searching and managing metadata License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 @@ -26,10 +27,13 @@ Source: baloo-%{version}.tar.xz Source1: baselibs.conf Source99: %{name}-rpmlintrc -BuildRequires: extra-cmake-modules >= 1.0.0 +# PATCH-FIX-UPSTREAM 0001-Revert-BasicIndexingQueue-Use-xapian-slots-to-fetch-.patch +Patch0: 0001-Revert-BasicIndexingQueue-Use-xapian-slots-to-fetch-.patch +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: kauth-devel >= 5.0.0 BuildRequires: kconfig-devel >= 5.0.0 BuildRequires: kcrash-devel >= 5.0.0 +BuildRequires: kdbusaddons-devel >= 5.0.0 BuildRequires: kdelibs4support-devel >= 5.0.0 BuildRequires: kf5-filesystem BuildRequires: kfilemetadata5-devel >= %{version} @@ -40,11 +44,11 @@ BuildRequires: libattr-devel BuildRequires: libxapian-devel BuildRequires: solid-devel >= 5.0.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Quick) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Quick) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Sql) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -70,8 +74,15 @@ Summary: Filesearch components for Baloo Framework Group: System/GUI/KDE Requires: libQt5Sql5-sqlite +%if %{with lang} Recommends: %{name}-lang +%endif +%if 0%{?suse_version} > 1320 +Provides: baloo-file = %{version} +Obsoletes: baloo-file < %{version} +%else Conflicts: baloo-file +%endif %description file Baloo is a framework for searching and managing metadata. This @@ -89,7 +100,12 @@ %package tools Summary: Aditional components for Baloo Framework Group: System/GUI/KDE +%if 0%{?suse_version} > 1320 +Provides: baloo-tools = %{version} +Obsoletes: baloo-tools < %{version} +%else Conflicts: baloo-tools +%endif %description tools Baloo is a framework for searching and managing metadata. This @@ -111,9 +127,14 @@ Requires: libKF5Baloo1 = %{version} Requires: libKF5BalooXapian1 = %{version} Requires: libxapian-devel -Requires: pkgconfig(Qt5Core) >= 5.2.0 +Requires: pkgconfig(Qt5Core) >= 5.4.0 # DBus interface file +#if 0%%{?suse_version} > 1320 +# We can't obsolete devel file as long as we don't have KF5-based KDEPIM +#Obsoletes: baloo-devel +#else Conflicts: baloo-devel +#endif %description devel Baloo is a framework for searching and managing metadata. This @@ -122,6 +143,7 @@ %lang_package %prep %setup -q -n baloo-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 @@ -130,11 +152,6 @@ %install %kf5_makeinstall -C build -# security review done only for 13.2 -%if %suse_version < 1320 -echo "setBadness('suse-dbus-unauthorized-service', 0)" > $RPM_SOURCE_DIR/%name-rpmlintrc -%endif - %post -n libKF5Baloo1 -p /sbin/ldconfig %postun -n libKF5Baloo1 -p /sbin/ldconfig @@ -160,7 +177,6 @@ %files file %defattr(-,root,root) %doc COPYING* -%dir %{_kf5_plugindir}/kf5 %{_kf5_bindir}/baloo_file %{_kf5_bindir}/baloo_file_cleaner %{_kf5_bindir}/baloo_file_extractor @@ -212,9 +228,11 @@ %defattr(-,root,root) %doc COPYING* +%if %{with lang} %files lang %defattr(-,root,root) %doc COPYING* %{_kf5_localedir}/ +%endif %changelog ++++++ 0001-Revert-BasicIndexingQueue-Use-xapian-slots-to-fetch-.patch ++++++ >From a85d450a1a321e284d253041ae5701a3966fede5 Mon Sep 17 00:00:00 2001 From: Vishesh Handa <[email protected]> Date: Tue, 28 Apr 2015 12:08:51 +0200 Subject: [PATCH 1/1] Revert "BasicIndexingQueue: Use xapian slots to fetch the mtime" This reverts commit cbf04acd7951a25f42fb3ead1e14943dd10dbebb. The Xapian Database seems to be getting corrupted a lot lately, and it gets stuck on accessing the value via Xapian::get_value. Lets revert to the previous method. We'll use more disk io, but at least we won't go crazy. --- src/file/basicindexingqueue.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/file/basicindexingqueue.cpp b/src/file/basicindexingqueue.cpp index 77366b1070364b26a75d38960ad4db43b16e8e12..68410b625f7121a032622cbab122d1b68cd2731a 100644 --- a/src/file/basicindexingqueue.cpp +++ b/src/file/basicindexingqueue.cpp @@ -138,7 +138,7 @@ bool BasicIndexingQueue::shouldIndex(FileMapping& file, const QString& mimetype) } XapianDocument doc = m_db->xapianDatabase()->document(file.id()); - const QByteArray dtStr = doc.value(0); + const QString dtStr = doc.fetchTermStartsWith("DT_M"); if (dtStr.isEmpty()) { return true; } @@ -149,8 +149,10 @@ bool BasicIndexingQueue::shouldIndex(FileMapping& file, const QString& mimetype) if (mimetype == QLatin1String("inode/directory")) return false; - const uint time_t = dtStr.toUInt(); - if (time_t != fileInfo.lastModified().toTime_t()) { + // The 4 is for "DT_M" + const QDateTime mtime = QDateTime::fromString(dtStr.mid(4), Qt::ISODate); + + if (mtime != fileInfo.lastModified()) { return true; } -- 2.3.5 ++++++ baloo-5.6.2.tar.xz -> baloo-5.9.0.tar.xz ++++++ ++++ 8228 lines of diff (skipped)
