From a6509f232b59800a8fd20d3d13bb37f149472a50 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 03 2018 14:23:02 +0000 Subject: 5.44.0 --- diff --git a/.gitignore b/.gitignore index 9ac56de..87da11d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /solid-5.43.0.tar.xz +/solid-5.44.0.tar.xz diff --git a/D10671.diff b/D10671.diff deleted file mode 100644 index c869886..0000000 --- a/D10671.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp ---- a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp -+++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp -@@ -111,7 +111,8 @@ - - const QString path = filePath(); - -- return !path.startsWith(QLatin1String("/media/")) -+ return !path.isEmpty() -+ && !path.startsWith(QLatin1String("/media/")) - && !path.startsWith(QLatin1String("/run/media/")) - && !path.startsWith(QDir::homePath()); - } - diff --git a/kf5-solid.spec b/kf5-solid.spec index be6c9f2..d741c0a 100644 --- a/kf5-solid.spec +++ b/kf5-solid.spec @@ -1,8 +1,8 @@ %global framework solid Name: kf5-%{framework} -Version: 5.43.0 -Release: 2%{?dist} +Version: 5.44.0 +Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 1 integration module that provides hardware information License: LGPLv2+ @@ -18,9 +18,6 @@ URL: https://solid.kde.org/ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz ## upstreamable patches -# https://bugs.kde.org/show_bug.cgi?id=389479 -# https://phabricator.kde.org/D10671 -Patch200: D10671.diff BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-rpm-macros >= %{version} @@ -117,6 +114,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sat Mar 03 2018 Rex Dieter - 5.44.0-1 +- 5.44.0 + * Wed Feb 21 2018 Rex Dieter - 5.43.0-2 - backport automount fix (kde#389479) - use %%ldconfig_scriptlets, %%make_build, %%find_lang_kf5 diff --git a/sources b/sources index f6fd1cf..741b46a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (solid-5.43.0.tar.xz) = 6a7dc7d75a0340e69900758be5aecc201bf8c1e5a28b549e4f50107ae9ff800701b0abb88cf0c917347723e62d3222f4e066e399c916c537f3560ac7b9d20f1d +SHA512 (solid-5.44.0.tar.xz) = 5e60699251be9703c33332fb5a445cea5e8e18d6b9adce093e1a3cdc89c6084696ce8fb9745458a6aa6f1bff8a499fba2a76fd641fe2b24541cb3371d2bd5f91