From c0078804480cd43e6a2aeb126b8a708dab332d45 Mon Sep 17 00:00:00 2001 From: tuibuilder_pel7x64builder0 Date: Wed, 27 Jan 2021 10:06:02 +0100 Subject: [PATCH] libolm remove python subpackage Signed-off-by: tuibuilder_pel7x64builder0 --- SPECS/libolm.spec | 61 +++++++---------------------------------------- 1 file changed, 9 insertions(+), 52 deletions(-) diff --git a/SPECS/libolm.spec b/SPECS/libolm.spec index d3fad98..61a93c4 100644 --- a/SPECS/libolm.spec +++ b/SPECS/libolm.spec @@ -1,105 +1,62 @@ +%undefine __cmake_in_source_build %global appname olm Name: libolm -Version: 3.1.4 +Version: 3.2.1 Release: 1%{?dist} - Summary: Double Ratchet cryptographic library License: ASL 2.0 URL: https://gitlab.matrix.org/matrix-org/%{appname} Source0: https://gitlab.matrix.org/matrix-org/%{appname}/-/archive/%{version}/%{appname}-%{version}.tar.bz2 - BuildRequires: ninja-build BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: gcc -BuildRequires: python3-devel -BuildRequires: python3-cffi -BuildRequires: python3-future %description An implementation of the Double Ratchet cryptographic ratchet in C++. + %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%package python3 -Summary: Python 3 bindings for %{name} -%{?python_provide:%python_provide python3-%{appname}} -Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - %description devel %{summary}. -%description python3 -%{summary}. %prep %autosetup -n %{appname}-%{version} -p1 mkdir -p %{_target_platform} -sed -e "s@/build@/%{_target_platform}@g" -i python/olm_build.py + %build pushd %{_target_platform} - %cmake3 -G Ninja \ +%cmake3 \ + -G Ninja \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ + -DCMAKE_INSTALL_LIBDIR="%{_libdir}" \ -DCMAKE_BUILD_TYPE=Release \ -DOLM_TESTS=ON \ .. popd %ninja_build -C %{_target_platform} -pushd python -%py3_build -popd - -%check -pushd %{_target_platform}/tests - ctest --output-on-failure -popd %install %ninja_install -C %{_target_platform} -pushd python -%py3_install -popd %files %license LICENSE %doc *.md *.rst docs/*.md %{_libdir}/%{name}.so.3* + %files devel %{_includedir}/%{appname} %{_libdir}/%{name}.so %{_libdir}/cmake/Olm -%files python3 -%{python3_sitearch}/%{appname} -%{python3_sitearch}/_%{name}.abi3.so -%{python3_sitearch}/python_%{appname}-*.egg-info %changelog -* Mon Nov 04 2019 Vitaly Zaitsev - 3.1.4-1 -- Updated to version 3.1.4. -- Added Python 3 bindings. - -* Tue Aug 06 2019 Vitaly Zaitsev - 3.1.3-1 -- Updated to version 3.1.3. - -* Thu Jul 25 2019 Fedora Release Engineering - 3.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 3.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jan 05 2019 Vitaly Zaitsev - 3.0.0-1 -- Updated to version 3.0.0. - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Jun 10 2018 Vitaly Zaitsev - 2.2.2-1 -- Initial SPEC release.