Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package olm for openSUSE:Factory checked in at 2021-04-29 22:46:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/olm (Old) and /work/SRC/openSUSE:Factory/.olm.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "olm" Thu Apr 29 22:46:58 2021 rev:2 rq:889373 version:3.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/olm/olm.changes 2021-01-15 19:45:43.253976499 +0100 +++ /work/SRC/openSUSE:Factory/.olm.new.1947/olm.changes 2021-04-29 22:53:37.829828297 +0200 @@ -1,0 +2,21 @@ +Sat Apr 17 12:00:00 UTC 2021 - [email protected] + +- Build and ship Python bindings. + +------------------------------------------------------------------- +Fri Apr 16 04:40:01 UTC 2021 - Wang Jun <[email protected]> + +- Update to 3.2.2 + * Fixes in the TypeScript definition file. + * CMake build fixes. Thanks to Gorgurov Alexey. + * Change the JavaScript package name to ``@matrix-org/olm``. Note that + this means that packages will need to change their ``require`` or + ``import`` statements to use this new name. + * Include file checksums in the JavaScript package. + * Fix length calculation in fallback key json. Thanks to Tobias Furuholm. + * Add a new function to calculate the correct base64 encoding for SAS. + (Currently only available in the C API.) + * Add the ability to specify a pickle key in the Objective-C binding. + * Add pkg-config file on Unix-like systems. + +------------------------------------------------------------------- Old: ---- olm-3.2.1.tar.gz New: ---- olm-3.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ olm.spec ++++++ --- /var/tmp/diff_new_pack.m6z7PV/_old 2021-04-29 22:53:38.325826012 +0200 +++ /var/tmp/diff_new_pack.m6z7PV/_new 2021-04-29 22:53:38.329825993 +0200 @@ -1,7 +1,7 @@ # # spec file for package olm # -# Copyright (c) 2020 SUSE LLC +# 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 @@ -16,58 +16,77 @@ # -%global libname libolm3 +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%global origname olm +%global origlibname lib%{origname} +%global libname %{origlibname}3 %global descriptor An implementation of the Double Ratchet cryptographic ratchet \ in C and C++, including an implementation of the Megolm cryptographic ratchet -Name: olm -Version: 3.2.1 + +Name: %{origname} +Version: 3.2.2 Release: 0 Summary: Double Ratchet cryptographic library License: Apache-2.0 -Group: Development/Libraries/C and C++ -URL: https://git.matrix.org/git/%{name}/about/ -Source0: https://gitlab.matrix.org/matrix-org/olm/-/archive/%{version}/%{name}-%{version}.tar.gz +Group: Development/Languages/Python +URL: https://git.matrix.org/git/%{origname}/about/ +Source0: https://gitlab.matrix.org/matrix-org/%{origname}/-/archive/%{version}/%{origname}-%{version}.tar.gz +BuildRequires: %{python_module cffi >= 1.0.0} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: pkg-config +BuildRequires: python-rpm-macros +Requires: %{libname} = %{version} +Requires: python-cffi >= 1.0.0 +Requires: python-future +%ifpython2 +Requires: python-typing +%endif +%python_subpackages %description -%{descriptor} +%{descriptor} . +This package contains %{python_flavor} bindings for %{origname}. -%package doc -Summary: Documentation files for %{name} +%package -n %{origname}-doc +Summary: Documentation files for %{origname} Group: Documentation/Other Suggests: %{libname} = %{version} BuildArch: noarch -%description doc +%description -n %{origname}-doc %{descriptor}. %{summary} %package -n %{libname} Summary: Double Ratchet cryptographic library as a C API Group: System/Libraries -Recommends: %{name}-doc = %{version} +Recommends: %{origname}-doc = %{version} %description -n %{libname} %{descriptor}. %{summary} -%package devel -Summary: Development files for %{name} +%package -n %{origname}-devel +Summary: Development files for %{origname} Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} -%description devel +%description -n %{origname}-devel %{descriptor}. %{summary} + %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{origname}-%{version} sed -i 's@$(PREFIX)/lib@%{_libdir}@g' Makefile %build +workdir=$(pwd) export CFLAGS="%{optflags}" export CXXFLAGS="$CFLAGS" @@ -79,27 +98,47 @@ %cmake_build %endif +cd $workdir/python +%python_build + %install -mkdir -p %{buildroot}%{_includedir}/%{name} +workdir=$(pwd) +mkdir -p %{buildroot}%{_includedir}/%{origname} %cmake_install DESTDIR=%{buildroot} PREFIX=%{_prefix} +cd $workdir/python +%python_install + %fdupes %{buildroot} %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig -%files doc +%files -n %{origname}-doc %defattr(0644, root, root, 0755) -%doc *.md *.rst docs/*.md +%doc *.md *.rst docs/*.md docs/*.svg %files -n %{libname} %license LICENSE -%{_libdir}/libolm.so.* +%{_libdir}/%{origlibname}.so.* -%files devel +%files -n %{origname}-devel %defattr(0644, root, root, 0755) -%{_includedir}/%{name} -%{_libdir}/libolm.so +%{_includedir}/%{origname} +%{_libdir}/%{origlibname}.so %{_libdir}/cmake/Olm +%{_libdir}/pkgconfig/%{origname}.pc + +%files %{python_files} +%license LICENSE +%doc python/README.md +%{python_sitearch}/%{origname} +%{python_sitearch}/python_%{origname}-*.egg-info + +%ifpython2 +%{python_sitearch}/_%{origlibname}.so +%else +%{python_sitearch}/_%{origlibname}.abi3.so +%endif %changelog ++++++ olm-3.2.1.tar.gz -> olm-3.2.2.tar.gz ++++++ ++++ 2112 lines of diff (skipped)
