Accepting request 508022 from home:jengelh:branches:network:messaging:matrix

- Do not suppress errors from useradd procedure.
- Trim description to the essence of the package. It is not
  supposed to be a manual or architectural document.
- Remove redundant %clean section. Replace %__-type macro
  indirections.

OBS-URL: https://build.opensuse.org/request/show/508022
OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=9
This commit is contained in:
Oliver Kurz 2017-07-04 10:19:47 +00:00 committed by Git OBS Bridge
parent 1a932d9c32
commit 2d837e4bfe
2 changed files with 22 additions and 34 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Jul 4 08:39:45 UTC 2017 - jengelh@inai.de
- Do not suppress errors from useradd procedure.
- Trim description to the essence of the package. It is not
supposed to be a manual or architectural document.
- Remove redundant %clean section. Replace %__-type macro
indirections.
-------------------------------------------------------------------
Thu Jun 29 20:53:00 UTC 2017 - okurz@suse.com

View File

@ -20,11 +20,11 @@
Name: matrix-%{short_name}
Version: 0.19.2
Release: 0
Summary: Synapse: Matrix reference homeserver
Summary: Matrix protocol reference homeserver
License: Apache-2.0
Group: Productivity/Networking/Instant Messenger
Source0: matrix-synapse-0.19.2.tar.gz
Url: https://github.com/%{github_user}/%{short_name}
Url: https://github.com/matrix-org/synapse
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: unzip
BuildRequires: %{python_module base}
@ -71,27 +71,8 @@ Provides: matrix-synapse = %{version}
%python_subpackages
%description
Matrix is an ambitious new ecosystem for open federated Instant Messaging and
VoIP. The basics you need to know to get up and running are:
- Everything in Matrix happens in a room. Rooms are distributed and do not
exist on any single server. Rooms can be located using convenience aliases
like `#matrix:matrix.org` or `#test:localhost:8448`.
- Matrix user IDs look like `@matthew:matrix.org` (although in the future
you will normally refer to yourself and others using a third party identifier
(3PID): email address, phone number, etc rather than manipulating Matrix user IDs)
The overall architecture is:
```
client <----> homeserver <=====================> homeserver <----> client
https://somewhere.org/_matrix https://elsewhere.net/_matrix
```
`#matrix:matrix.org` is the official support room for Matrix, and can be
accessed by any client from https://matrix.org/docs/projects/try-matrix-now or
via IRC bridge at irc://irc.freenode.net/matrix.
Synapse is a Python-based reference "homeserver" implementation of
Matrix. Matrix is a system for federated Instant Messaging and VoIP.
%prep
%setup -q -n %{short_name}-%{version}
@ -120,17 +101,17 @@ chmod +x build/lib/synapse/app/synctl.py
%install
%python_install
%{__mkdir_p} "%{buildroot}%{_sysconfdir}/synapse"
%{__install} -m 0644 contrib/systemd/log_config.yaml \
mkdir -p "%{buildroot}%{_sysconfdir}/synapse"
install -m 0644 contrib/systemd/log_config.yaml \
"%{buildroot}%{_sysconfdir}/synapse"
%{__mkdir_p} %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_sbindir}
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcsynapse
%{__mkdir_p} "%{buildroot}%{_unitdir}"
%{__install} -m 0644 contrib/systemd/synapse.service \
mkdir -p "%{buildroot}%{_unitdir}"
install -m 0644 contrib/systemd/synapse.service \
"%{buildroot}%{_unitdir}"
%{__mkdir_p} "%{buildroot}%{_rundir}/synapse"
mkdir -p "%{buildroot}%{_rundir}/synapse"
%python_expand %fdupes %{buildroot}%{$python_sitelib}
for p in hash_password register_new_matrix_user synapse_port_db synctl ; do
@ -140,12 +121,9 @@ done
%python_clone -a %{buildroot}%{_unitdir}/synapse.service
%python_clone -a %{buildroot}%{_sysconfdir}/synapse/log_config.yaml
%clean
rm -rf %{buildroot}
%pre
getent group nogroup &>/dev/null || /usr/sbin/groupadd -r nogroup
getent passwd synapse &>/dev/null || \
getent group nogroup >/dev/null || /usr/sbin/groupadd -r nogroup
getent passwd synapse >/dev/null || \
/usr/sbin/useradd -r -g nogroup -s /sbin/nologin -c 'Matrix Synapse' \
-d %{_localstatedir}/lib/synapse synapse
%service_add_pre synapse.service
@ -174,4 +152,5 @@ getent passwd synapse &>/dev/null || \
%python_alternative %{_sbindir}/rcsynapse
%python_alternative %{_unitdir}/synapse.service
%config %python_alternative %{_sysconfdir}/synapse/log_config.yaml
%changelog