From 2d5388c9c6cd1d47a8984f0ee7efdf8fc33d6ed35db9326ccb048adfb496db20 Mon Sep 17 00:00:00 2001
From: Dead Mozay <dead_mozay@opensuse.org>
Date: Fri, 24 Jul 2020 17:17:53 +0000
Subject: [PATCH] Accepting request 822697 from home:tux93:matrix

- Update to 0.6.0 stable

OBS-URL: https://build.opensuse.org/request/show/822697
OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/libQuotient?expand=0&rev=3
---
 0.6-beta1.tar.gz      |  3 ---
 0.6.0.tar.gz          |  3 +++
 libQuotient.changes   |  5 +++++
 libQuotient.spec      |  8 +++-----
 update_libqtolm.patch | 22 ----------------------
 5 files changed, 11 insertions(+), 30 deletions(-)
 delete mode 100644 0.6-beta1.tar.gz
 create mode 100644 0.6.0.tar.gz
 delete mode 100644 update_libqtolm.patch

diff --git a/0.6-beta1.tar.gz b/0.6-beta1.tar.gz
deleted file mode 100644
index cddbdba..0000000
--- a/0.6-beta1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a895a50938d87490ec726ac2a99957643d2af2b8099698a72418cc64a49d18dc
-size 549192
diff --git a/0.6.0.tar.gz b/0.6.0.tar.gz
new file mode 100644
index 0000000..28b6347
--- /dev/null
+++ b/0.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1837b8fbeaf4b1dd4d86847eb58ea1ff5c89055b05a6f23039315db2ddc8d41b
+size 556773
diff --git a/libQuotient.changes b/libQuotient.changes
index acfc94b..4054df7 100644
--- a/libQuotient.changes
+++ b/libQuotient.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 24 16:37:51 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org>
+
+- Update to 0.6.0 stable
+
 -------------------------------------------------------------------
 Tue Jun  9 23:08:47 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org>
 
diff --git a/libQuotient.spec b/libQuotient.spec
index 9c0c457..647bd83 100644
--- a/libQuotient.spec
+++ b/libQuotient.spec
@@ -19,15 +19,13 @@
 %define soversion 0_6
 
 Name:           libQuotient
-Version:        0.6
+Version:        0.6.0
 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
-Source0:        https://github.com/quotient-im/%{name}/archive/%{version}-beta1.tar.gz
-# PATCH-FIX-UPSTREAM - Update libQtOlm
-Patch0:         update_libqtolm.patch
+Source0:        https://github.com/quotient-im/%{name}/archive/%{version}.tar.gz
 BuildRequires:  unzip
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -61,7 +59,7 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -n %{name}-%{version}-beta1 -p1
+%autosetup -n %{name}-%{version} -p1
 
 %build
 %cmake -DQuotient_ENABLE_E2EE=ON
diff --git a/update_libqtolm.patch b/update_libqtolm.patch
deleted file mode 100644
index dc05df4..0000000
--- a/update_libqtolm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e4b0165aa004e469ade8e24cc16a989affd3d782 Mon Sep 17 00:00:00 2001
-From: Bart Ribbers <bribbers@disroot.org>
-Date: Mon, 6 Apr 2020 13:21:16 +0200
-Subject: [PATCH] CMakeLists.txt: update libQtOlm to 3.0.1
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6fac4672..68e49a67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,7 +73,7 @@ if (${PROJECT_NAME}_ENABLE_E2EE)
-     if (NOT USE_INTREE_LIBQOLM)
-         set(SAVED_CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
-         set(CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
--        find_package(QtOlm 0.1.0 REQUIRED)
-+        find_package(QtOlm 3.0.1 REQUIRED)
-         if (NOT QtOlm_FOUND)
-             message( WARNING "libQtOlm not found; configuration will most likely fail.")
-             message( WARNING "Make sure you have installed libQtOlm development files")