Prevent conflicts between python2/3 version of packages

OBS-URL: https://build.opensuse.org/package/show/network:messaging:matrix/matrix-synapse?expand=0&rev=4
This commit is contained in:
Oliver Kurz 2017-06-29 20:53:04 +00:00 committed by Git OBS Bridge
parent 44fcf5fbb7
commit 044df37092
2 changed files with 24 additions and 11 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jun 29 20:53:00 UTC 2017 - okurz@suse.com
- Prevent conflicts between python2/3 version of packages
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 18 12:05:47 UTC 2017 - okurz@suse.com Sun Jun 18 12:05:47 UTC 2017 - okurz@suse.com

View File

@ -64,6 +64,8 @@ Requires: python-pysaml2 >= 3.0.0
#BuildRequires: python-pysaml2 < 4.0.0 #BuildRequires: python-pysaml2 < 4.0.0
Requires: python-pymacaroons-pynacl Requires: python-pymacaroons-pynacl
Requires: python-msgpack-python >= 0.3.0 Requires: python-msgpack-python >= 0.3.0
Requires(post): update-alternatives
Requires(postun): update-alternatives
BuildArch: noarch BuildArch: noarch
%python_subpackages %python_subpackages
@ -128,11 +130,16 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcsynapse
%{__install} -m 0644 contrib/systemd/synapse.service \ %{__install} -m 0644 contrib/systemd/synapse.service \
"%{buildroot}%{_unitdir}" "%{buildroot}%{_unitdir}"
%{__mkdir_p} "%{buildroot}%{_rundir}/synapse"
%{__mkdir_p} "%{buildroot}%{_rundir}/synapse"
%{__mkdir_p} "%{buildroot}%{_rundir}/synapse" %{__mkdir_p} "%{buildroot}%{_rundir}/synapse"
%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_expand %fdupes %{buildroot}%{$python_sitelib}
for p in hash_password register_new_matrix_user synapse_port_db synctl ; do
%python_clone -a %{buildroot}%{_bindir}/$p
done
%python_clone -a %{buildroot}%{_sbindir}/rcsynapse
%python_clone -a %{buildroot}%{_unitdir}/synapse.service
%python_clone -a %{buildroot}%{_sysconfdir}/synapse/log_config.yaml
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -144,26 +151,27 @@ getent passwd synapse &>/dev/null || \
%service_add_pre synapse.service %service_add_pre synapse.service
%post %post
%{python_install_alternative synctl hash_password register_new_matrix_user synapse_port_db rcsynapse synapse.service log_config.yaml}
%service_add_post synapse.service %service_add_post synapse.service
%preun %preun
%service_del_preun synapse.service %service_del_preun synapse.service
%postun %postun
%python_uninstall_alternative synctl
%service_del_postun synapse.service %service_del_postun synapse.service
%files %{python_files} %files %{python_files}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc *.rst %doc *.rst
%doc LICENSE %doc LICENSE
%attr(0710,root,synapse) %dir %{_sysconfdir}/synapse %dir %{_sysconfdir}/synapse
%config %{_sysconfdir}/synapse/*
%{python_sitelib} %{python_sitelib}
%{_bindir}/hash_password %python_alternative %{_bindir}/hash_password
%{_bindir}/register_new_matrix_user %python_alternative %{_bindir}/register_new_matrix_user
%{_bindir}/synapse_port_db %python_alternative %{_bindir}/synapse_port_db
%{_bindir}/synctl %python_alternative %{_bindir}/synctl
%{_sbindir}/rcsynapse %python_alternative %{_sbindir}/rcsynapse
%{_unitdir}/synapse.service %python_alternative %{_unitdir}/synapse.service
%config %python_alternative %{_sysconfdir}/synapse/log_config.yaml
%changelog %changelog