Accepting request 859975 from home:luca_b:branches:network:messaging:matrix

- Add a build conditional for E2EE and disable it by default, as
  applications using libQuotient with E2EE enabled have
  stability issues and memory leaks
- Run spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/859975
OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/libQuotient?expand=0&rev=6

libQuotient.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Jan  3 19:29:38 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
+
+- Add a build conditional for E2EE and disable it by default, as
+  applications using libQuotient with E2EE enabled have
+  stability issues and memory leaks
+- Run spec-cleaner
+
 -------------------------------------------------------------------
 Tue Dec 29 07:35:30 UTC 2020 - Dead Mozay <dead-mozay@opensuse.org>
 

libQuotient.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libQuotient
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,30 +12,32 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define soversion 0_6
-
+%bcond_without e2ee
 Name:           libQuotient
 Version:        0.6.3
 Release:        0
 Summary:        Library for Qt Matrix Clients
 License:        LGPL-2.1-only
 Group:          Development/Libraries/C and C++
-Url:            https://github.com/quotient-im/libQuotient
+URL:            https://github.com/quotient-im/libQuotient
 Source0:        https://github.com/quotient-im/%{name}/archive/%{version}.tar.gz
-BuildRequires:  unzip
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
+BuildRequires:  unzip
 BuildRequires:  pkgconfig(Qt5Core) >= 5.6
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Multimedia)
 BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(QtOlm)
+%if %{with e2ee}
 BuildRequires:  cmake(Olm)
+BuildRequires:  pkgconfig(QtOlm)
+%endif
 
 %description
 Library for Qt-based Matrix chat clients. It is required by
@@ -62,7 +64,11 @@ developing applications that use %{name}.
 %autosetup -n %{name}-%{version} -p1
 
 %build
+%if %{with e2ee}
 %cmake -DQuotient_ENABLE_E2EE=ON
+%else
+%cmake -DQuotient_ENABLE_E2EE=OFF
+%endif
 
 %cmake_build