Hello community, here is the log from the commit of package matrix-synapse for openSUSE:Factory checked in at 2018-04-30 22:53:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/matrix-synapse (Old) and /work/SRC/openSUSE:Factory/.matrix-synapse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "matrix-synapse" Mon Apr 30 22:53:57 2018 rev:6 rq:601812 version:0.27.4 Changes: -------- --- /work/SRC/openSUSE:Factory/matrix-synapse/matrix-synapse.changes 2018-04-17 11:18:51.902621279 +0200 +++ /work/SRC/openSUSE:Factory/.matrix-synapse.new/matrix-synapse.changes 2018-04-30 22:56:33.873658889 +0200 @@ -1,0 +2,10 @@ +Fri Apr 27 06:19:26 UTC 2018 - okurz@suse.com + +- Disable web-client for package self-test to get rid of unfulfilled dependency + +------------------------------------------------------------------- +Fri Apr 20 18:32:40 UTC 2018 - okurz@suse.com + +- Introduce package self-test based on _multibuild + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ matrix-synapse.spec ++++++ --- /var/tmp/diff_new_pack.j9LY84/_old 2018-04-30 22:56:35.081614813 +0200 +++ /var/tmp/diff_new_pack.j9LY84/_new 2018-04-30 22:56:35.085614666 +0200 @@ -1,5 +1,5 @@ # -# spec file for package matrix-synapse +# spec file for package matrix # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -23,10 +23,20 @@ # * https://github.com/matrix-org/synapse/releases # * Commit+submit +# Define just "test" as a package in _multibuild file to distinguish test +# instructions here +%if "@BUILD_FLAVOR@" == "" +%define _test 0 +%define name_ext %nil +%else +%define _test 1 +%define name_ext -test +%endif + %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define github_user matrix-org %define short_name synapse -Name: matrix-%{short_name} +Name: matrix-%{short_name}%{?name_ext} Version: 0.27.4 Release: 0 Summary: Matrix protocol reference homeserver @@ -35,6 +45,9 @@ Source0: matrix-synapse-v%{version}.tar.xz Url: https://github.com/matrix-org/synapse BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?_test} +BuildRequires: matrix-%{short_name} +%else BuildRequires: %{python_module base} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -47,7 +60,7 @@ %endif Requires: python-Twisted Requires: python-bcrypt -Requires: python-canonicaljson >= 1.0.0 +Requires: python-canonicaljson >= 1.1.3 Requires: python-frozendict >= 0.4 Requires: python-jsonschema >= 2.5.1 Requires: python-msgpack-python @@ -73,17 +86,26 @@ Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch -%ifpython2 +%if "%{python_flavor}" == "python2" Provides: matrix-synapse = %{version} %endif +%endif +%if 0%{?_test} +%else %python_subpackages +%endif %description Synapse is a Python-based reference "homeserver" implementation of Matrix. Matrix is a system for federated Instant Messaging and VoIP. %prep +%if 0%{?_test} +# workaround to prevent post/install failing assuming this file for whatever +# reason +touch %{_sourcedir}/%{short_name} +%else %setup -q -n %{name}-v%{version} for i in \ app/client_reader \ @@ -110,12 +132,28 @@ sed -i 's@#!/usr/bin/env python@#!/usr/bin/python@g' $i done sed -i '1 s@#!/usr/bin/env perl@#!/usr/bin/perl@g' scripts/sync_room_to_group.pl +%endif %build +%if 0%{?_test} +python -m synapse.app.homeserver --generate-config --server localhost --config-path homeserver.yaml --report-stats=no +# Disable the web client which would need python-matrix-synapse-angular-client +# as a dependency for this test which is not available in all repos and we do +# not want to rely on it +# https://github.com/matrix-org/synapse/issues/2113 +sed -e 's/\(web_client: \).*$/\1False/' -e '/- webclient # The bundled webclient/d' -e 's/- names: \[client, webclient\]/- names: [client]/' -i homeserver.yaml +synctl start +register_new_matrix_user --config homeserver.yaml --user opensuse --password opensuse --admin https://localhost:8448 +%else %python_build chmod +x build/lib/synapse/app/synctl.py +%endif %install +%if 0%{?_test} +# disable debug packages in package test to prevent error about missing files +%define debug_package %{nil} +%else %python_install mkdir -p "%{buildroot}%{_sysconfdir}/synapse" @@ -171,4 +209,6 @@ %python3_only %{_bindir}/sync_room_to_group.pl %python3_only %{_bindir}/move_remote_media_to_new_store.py +%endif + %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild>