Hello community, here is the log from the commit of package mrsh for openSUSE:Factory checked in at 2018-10-01 08:15:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mrsh (Old) and /work/SRC/openSUSE:Factory/.mrsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mrsh" Mon Oct 1 08:15:24 2018 rev:7 rq:637210 version:2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/mrsh/mrsh.changes 2018-01-13 21:48:57.358414623 +0100 +++ /work/SRC/openSUSE:Factory/.mrsh.new/mrsh.changes 2018-10-01 08:15:28.406042678 +0200 @@ -1,0 +2,8 @@ +Sat Sep 22 15:15:04 UTC 2018 - [email protected] + +- Replace 'Requires(post): systemd' with appropriate macro. +- Move %systemd_requires to the server sub-package. +- Add missing services in pre/post/preun/postun scripts. +- Fix systemd BuildRequires. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mrsh.spec ++++++ --- /var/tmp/diff_new_pack.y21xI8/_old 2018-10-01 08:15:29.110042226 +0200 +++ /var/tmp/diff_new_pack.y21xI8/_new 2018-10-01 08:15:29.118042221 +0200 @@ -24,7 +24,7 @@ Version: 2.12 Release: 0 Summary: Remote shell program that uses munge authentication -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Clustering/Computing Url: https://github.com/chaos/mrsh Source0: https://github.com/chaos/mrsh/archive/%{version}.tar.gz @@ -37,9 +37,9 @@ BuildRequires: pam-devel BuildRequires: pkg-config %if 0%{?have_systemd} -BuildRequires: systemd-devel -Requires(post): systemd +BuildRequires: systemd-mini %endif +BuildRequires: fdupes # support re-run of autogen BuildRequires: autoconf @@ -52,36 +52,38 @@ Remote shell programs that use munge authentication rather than reserved ports for security. -%package -n %{name}-server +%package server Summary: Servers for remote access commands (mrsh, mrlogin, mrcp) Group: System/Daemons Requires: mrsh Requires: tcpd -%if 0%{!?have_systemd} +%if 0%{?have_systemd} +%{?systemd_requires} +%else Requires: xinetd %endif -%description -n %{name}-server +%description server Server daemons for remote access commands (mrsh, mrlogin, mrcp) -%package -n %{name}-rsh-compat +%package rsh-compat Summary: Rsh compatibility package for mrcp/mrlogin/mrsh Group: System/Base Requires: mrsh = %version Provides: rsh Conflicts: otherproviders(rsh) -%description -n %{name}-rsh-compat +%description rsh-compat This package provides rsh compatibility for mrcp/mrlogin/mrsh -%package -n %{name}-rsh-server-compat +%package rsh-server-compat Summary: Rsh server compatibility package for mrlogind/mrshd Group: System/Daemons Requires: mrsh-server = %version Provides: rsh-server Conflicts: otherproviders(rsh-server) -%description -n %{name}-rsh-server-compat +%description rsh-server-compat This package provides rsh server compatibility for mrlogind/mrshd %prep @@ -114,15 +116,16 @@ sed -i 's#disable\s*= yes#disable = no#' %{buildroot}/etc/xinetd.d/mrlogind sed -i 's#disable\s*= yes#disable = no#' %{buildroot}/etc/xinetd.d/mrshd %endif +%fdupes -s %{buildroot} %pre server %if 0%{?have_systemd} -%service_add_pre mrshd.socket mrlogind.socket +%service_add_pre mrshd.socket mrlogind.socket [email protected] [email protected] %endif %post server %if 0%{?have_systemd} -%service_add_post mrshd.socket mrlogind.socket +%service_add_post mrshd.socket mrlogind.socket [email protected] [email protected] %else %restart_on_update xinetd %endif @@ -133,12 +136,12 @@ %preun server %if 0%{?have_systemd} -%service_del_preun %{?service_arg:-f} mrshd.socket mrlogind.socket +%service_del_preun %{?service_arg:-n} mrshd.socket mrlogind.socket [email protected] [email protected] %endif %postun server %if 0%{?have_systemd} -%service_del_postun %{?service_arg:-n} mrshd.socket mrlogind.socket +%service_del_postun %{?service_arg:-n} mrshd.socket mrlogind.socket [email protected] [email protected] %else %restart_on_update xinetd %endif @@ -153,7 +156,7 @@ %{_bindir}/mrsh %{_bindir}/mrlogin -%files -n %{name}-server +%files server %defattr(-,root,root) %{!?have_systemd:%attr(644,root,root) %config(noreplace) /etc/xinetd.d/mrshd} %{!?have_systemd:%attr(644,root,root) %config(noreplace) /etc/xinetd.d/mrlogind} @@ -167,7 +170,7 @@ %{_sbindir}/in.mrlogind %{_sbindir}/in.mrshd -%files -n %{name}-rsh-compat +%files rsh-compat %defattr(-,root,root) %{_mandir}/man1/rcp.1* %{_mandir}/man1/rsh.1* @@ -176,7 +179,7 @@ %{_bindir}/rsh %{_bindir}/rlogin -%files -n %{name}-rsh-server-compat +%files rsh-server-compat %defattr(-,root,root) %{_mandir}/man8/in.rlogind.8* %{_mandir}/man8/in.rshd.8*
