Oliver Kurz 2020-06-13 14:05:11 +00:00 committed by Git OBS Bridge
parent a510452d2c
commit 47d98621ce
6 changed files with 61 additions and 28 deletions

3
0.6-beta1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a895a50938d87490ec726ac2a99957643d2af2b8099698a72418cc64a49d18dc
size 549192

View File

@ -9,11 +9,10 @@
<param name="versionformat">0.6.0</param>
<param name="revision">master</param>
<param name="changesgenerate">enable</param>
<param name="changesauthor">dead_mozay@opensuse.org</param>
</service>
<service mode="disabled" name="set_version"/>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<service name="tar" mode="disabled"/>
<service name="recompress" mode="disabled">
<param name="compression">gz</param>
<param name="file">*.tar</param>
</service>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:420c1c7d04b18d48e517b59abb08691823055182b20def31f290c7a18e141c0a
size 3350540

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jun 9 23:08:47 UTC 2020 - Marcel Kuehlhorn <tux93@opensuse.org>
- Update to 0.6-beta1
* actually build against the packaged libQtOml instead of the
intree version
-------------------------------------------------------------------
Sat Feb 22 10:51:12 UTC 2020 - dead_mozay@opensuse.org

View File

@ -19,13 +19,15 @@
%define soversion 0_6
Name: libQuotient
Version: 0.6.0
Version: 0.6
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: %{name}-%{version}.tar.gz
Source0: https://github.com/quotient-im/%{name}/archive/%{version}-beta1.tar.gz
# PATCH-FIX-UPSTREAM - Update libQtOlm
Patch0: update_libqtolm.patch
BuildRequires: unzip
BuildRequires: cmake
BuildRequires: gcc-c++
@ -52,17 +54,19 @@ Quaternion.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/C and C++
Requires: %{name}%{soversion} = %{version}
Requires: %{name}%{soversion} = %{version}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%autosetup -p1
%autosetup -n %{name}-%{version}-beta1 -p1
%build
%cmake
%cmake -DQuotient_ENABLE_E2EE=ON
%cmake_build
%install
%cmake_install
@ -81,24 +85,25 @@ developing applications that use %{name}.
%{_libdir}/pkgconfig/Quotient.pc
%{_libdir}/libQuotient.so
%{_libdir}/cmake/Quotient/
%dir %{_includedir}/csapi
%dir %{_includedir}/csapi/definitions
%dir %{_includedir}/csapi/definitions/wellknown
%dir %{_includedir}/application-service
%dir %{_includedir}/application-service/definitions
%dir %{_includedir}/identity
%dir %{_includedir}/identity/definitions
%dir %{_includedir}/jobs
%dir %{_includedir}/events
%dir %{_includedir}/Quotient
%dir %{_includedir}/Quotient/csapi
%dir %{_includedir}/Quotient/csapi/definitions
%dir %{_includedir}/Quotient/csapi/definitions/wellknown
%dir %{_includedir}/Quotient/application-service
%dir %{_includedir}/Quotient/application-service/definitions
%dir %{_includedir}/Quotient/identity
%dir %{_includedir}/Quotient/identity/definitions
%dir %{_includedir}/Quotient/jobs
%dir %{_includedir}/Quotient/events
%dir %{_datadir}/ndk-modules
%{_includedir}/*.h
%{_includedir}/application-service/definitions/*.h
%{_includedir}/csapi/*.h
%{_includedir}/csapi/definitions/*h
%{_includedir}/csapi/definitions/wellknown/*h
%{_includedir}/events/*.h
%{_includedir}/identity/definitions/*.h
%{_includedir}/jobs/*.h
%{_includedir}/Quotient/*.h
%{_includedir}/Quotient/application-service/definitions/*.h
%{_includedir}/Quotient/csapi/*.h
%{_includedir}/Quotient/csapi/definitions/*h
%{_includedir}/Quotient/csapi/definitions/wellknown/*h
%{_includedir}/Quotient/events/*.h
%{_includedir}/Quotient/identity/definitions/*.h
%{_includedir}/Quotient/jobs/*.h
%{_bindir}/quotest
%{_datadir}/ndk-modules/Android.mk

22
update_libqtolm.patch Normal file
View File

@ -0,0 +1,22 @@
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")