Accepting request 516882 from home:eeich:branches:network:cluster

- Enable tcpwrappers on all platforms by default.
- Fix systemd-specific conditionals in spec file.
- Remove Provides: group/user(): these are only
  used by conman, there is no intention to provide
  them to other packages.

OBS-URL: https://build.opensuse.org/request/show/516882
OBS-URL: https://build.opensuse.org/package/show/network:cluster/conman?expand=0&rev=9

conman.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Aug 14 13:42:48 UTC 2017 - eich@suse.com
+
+- Enable tcpwrappers on all platforms by default.
+- Fix systemd-specific conditionals in spec file.
+- Remove Provides: group/user(): these are only
+  used by conman, there is no intention to provide
+  them to other packages.
+
 -------------------------------------------------------------------
 Sat Jun  3 01:50:39 UTC 2017 - jjolly@suse.com
 

conman.spec

@@ -49,12 +49,8 @@ BuildRequires:  tcpd-devel
 BuildRequires:  freeipmi-devel
 %endif
 Source0:        https://github.com/dun/conman/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
-%if 0%{?have_systemd}
 Source1:        %{name}.service
-
+%if 0%{?have_systemd}
-Provides:       group(conman)
-Provides:       user(conman)
-
 BuildRequires:  systemd
 BuildRequires:  systemd-rpm-macros
 %{?systemd_requires}
@@ -129,7 +125,7 @@ SERVER logfile="/var/log/conman.log"
 SERVER loopback=ON
 SERVER pidfile="/var/run/conman.pid"
 SERVER resetcmd="powerman -0 %N; sleep 3; powerman -1 %N"
-SERVER tcpwrappers=%{?is_opensuse:OFF}%{!?is_opensuse:ON}
+SERVER tcpwrappers=ON
 SERVER timestamp=1h
 GLOBAL seropts="115200,8n1"
 GLOBAL log="console.%N"
@@ -137,8 +133,8 @@ GLOBAL logopts="sanitize,timestamp"
 EOF
 fi
 
-%pre
 %if 0%{?have_systemd}
+%pre
 %service_add_pre conman.service
 %endif
 %define conman_home "%_localstatedir%_rundir/conman"