Accepting request 685803 from home:jengelh:sct

- Remove pre-12.2 parts from build recipe
- Reduce hard dependency on systemd
- Replace old $RPM_* shell vars and %__-type macro indirections.

trim invisible trailing whitespace

OBS-URL: https://build.opensuse.org/request/show/685803
OBS-URL: https://build.opensuse.org/package/show/security/autossh?expand=0&rev=30

autossh.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Mar 17 14:12:50 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Remove pre-12.2 parts from build recipe
+- Reduce hard dependency on systemd
+- Replace old $RPM_* shell vars and %__-type macro indirections.
+
 -------------------------------------------------------------------
 Mon Oct 15 02:59:43 UTC 2018 - sean@suspend.net
 

autossh.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package autossh
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -21,11 +21,7 @@
   %define _fillupdir /var/adm/fillup-templates
 %endif
 
-%if 0%{?suse_version} > 1220
 %define with_systemd 1
-%else
-%define with_systemd 0
-%endif
 
 Summary:        Automatically restart SSH sessions and tunnels
 License:        BSD-3-Clause
@@ -34,8 +30,8 @@ Group:          Productivity/Networking/SSH
 Name:           autossh
 Version:        1.4f
 Release:        0
-Url:            http://www.harding.motd.ca/autossh/
-Source:         http://www.harding.motd.ca/autossh/%{name}-%{version}.tgz
+URL:            https://www.harding.motd.ca/autossh/
+Source:         https://www.harding.motd.ca/autossh/%{name}-%{version}.tgz
 Source1:        autossh.init
 Source2:        autossh.conf
 Source3:        autossh.service
@@ -46,12 +42,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # configure checks is the ssh client exists
 BuildRequires:  openssh
 Requires:       openssh
-%if %{with_systemd}
-BuildRequires:  systemd
-%{?systemd_requires}
-%else
-Requires(pre):  %fillup_prereq %insserv_prereq
-%endif
+BuildRequires:  systemd-rpm-macros
+%{?systemd_ordering}
 
 %description
 Autossh is a program to start a copy of ssh and monitor it, restarting
@@ -69,55 +61,34 @@ cp %{S:5} .
 
 %build
 %configure
-%__make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 %makeinstall
-%__mkdir_p %{buildroot}%{_sbindir}
-%if %{with_systemd}
-%__install -D -m 444 %{S:3} %{buildroot}%{_unitdir}/autossh@.service
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcautossh
-%else
-%__install -D -m 755 %{S:1} %{buildroot}%{_initrddir}/autossh
-%__ln_s -f %{_initrddir}/autossh %{buildroot}%{_sbindir}/rcautossh
-%__install -D -m 644 %{S:2} %{buildroot}%{_fillupdir}/sysconfig.autossh
-%endif
-%__rm "$RPM_BUILD_ROOT/usr/share/doc/autossh"/{CHANGES,README}
-%__rm -rf "%{buildroot}%{_datadir}/examples"
+mkdir -p %{buildroot}/%{_sbindir}
+install -D -m 444 %{S:3} %{buildroot}/%{_unitdir}/autossh@.service
+ln -s /usr/sbin/service %{buildroot}/%{_sbindir}/rcautossh
+rm "%buildroot/%{_datadir}/doc/autossh"/{CHANGES,README}
+rm -rf "%{buildroot}/%{_datadir}/examples"
 
-%if %{with_systemd}
 %pre
 %service_add_pre %{name}.service
 
 %preun
 %service_del_preun %{name}.service
-%endif
 
 %post
-%if %{with_systemd}
 %service_add_post %{name}.service
-%else
-%fillup_only
-%endif
 
 %postun
-%if %{with_systemd}
 %service_del_postun %{name}.service
-%else
-%insserv_cleanup
-%endif
 
 %files
 %defattr(-, root, root, 0755)
 %doc CHANGES README README.SUSE.md my.conf
 %doc autossh.host rscreen
 %{_bindir}/autossh
-%if %{with_systemd}
 %{_unitdir}/%{name}@.service
-%else
-%{_initrddir}/autossh
-%{_fillupdir}/sysconfig.autossh
-%endif
 %{_sbindir}/rcautossh
 %doc %{_mandir}/man1/autossh.1*