Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mrsh for openSUSE:Factory checked in at 2021-02-19 23:45:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mrsh (Old) and /work/SRC/openSUSE:Factory/.mrsh.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mrsh" Fri Feb 19 23:45:46 2021 rev:12 rq:873758 version:2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/mrsh/mrsh.changes 2020-04-21 13:13:36.749164732 +0200 +++ /work/SRC/openSUSE:Factory/.mrsh.new.28504/mrsh.changes 2021-02-19 23:46:19.363425593 +0100 @@ -1,0 +2,7 @@ +Fri Feb 19 07:23:11 UTC 2021 - Egbert Eich <[email protected]> + +- Convert service_del_postun -n to service_del_postun_without_restart. +- Fix build issues on older products due to the introduction of + %license. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mrsh.spec ++++++ --- /var/tmp/diff_new_pack.eDK3HD/_old 2021-02-19 23:46:19.899426118 +0100 +++ /var/tmp/diff_new_pack.eDK3HD/_new 2021-02-19 23:46:19.903426122 +0100 @@ -1,7 +1,7 @@ # # spec file for package mrsh # -# 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 @@ -19,6 +19,9 @@ %if 0%{?suse_version} >= 1230 %define have_systemd 1 %endif +%if 0%{?sle_version:1} && 0%{?sle_version} < 120300 +%define licensedir %_datarootdir/licenses +%endif Name: mrsh Version: 2.12 @@ -120,6 +123,7 @@ 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 +%{?licensedir:mkdir -p %{buildroot}/%licensedir} %fdupes -s %{buildroot} %pre server @@ -134,24 +138,33 @@ %restart_on_update xinetd %endif -%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120100 -%define service_arg 1 -%endif - %preun server -%if 0%{?have_systemd} -%service_del_preun %{?service_arg:-n} mrshd.socket mrlogind.socket [email protected] [email protected] +%if (0%{?suse_version} > 1320 || 0%{?sle_version} > 120100) && 0%{?suse_version} < 1500 + %{service_del_preun -n mrshd.socket mrlogind.socket [email protected] [email protected]} +%else + %if 0%{?have_systemd} + %{service_del_preun mrshd.socket mrlogind.socket [email protected] [email protected]} + %endif %endif %postun server -%if 0%{?have_systemd} -%service_del_postun %{?service_arg:-n} mrshd.socket mrlogind.socket [email protected] [email protected] +%if 0%{?suse_version} > 1500 + %{service_del_postun_without_restart mrshd.socket mrlogind.socket [email protected] [email protected]} %else -%restart_on_update xinetd + %if (0%{?suse_version} > 1320 || 0%{?sle_version} > 120100) + %{service_del_postun mrshd.socket mrlogind.socket [email protected] [email protected]} + %else + %if 0%{?have_systemd} + %{service_del_postun mrshd.socket mrlogind.socket [email protected] [email protected]}} + %else + %restart_on_update xinetd + %endif + %endif %endif %files %doc NEWS README ChangeLog +%{?licensedir:%dir %licensedir} %license COPYING DISCLAIMER DISCLAIMER.UC %{_mandir}/man1/mrcp.1* %{_mandir}/man1/mrsh.1* @@ -161,7 +174,7 @@ %{_bindir}/mrlogin %files server -%doc %{basename %{S:1}} +%doc %{basename: %{S:1}} %{!?have_systemd:%attr(644,root,root) %config(noreplace) /etc/xinetd.d/mrshd} %{!?have_systemd:%attr(644,root,root) %config(noreplace) /etc/xinetd.d/mrlogind} %attr(644,root,root) %config(noreplace) /etc/pam.d/mrsh
