Hello community,

here is the log from the commit of package conman for openSUSE:Factory checked 
in at 2018-09-24 13:13:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/conman (Old)
 and      /work/SRC/openSUSE:Factory/.conman.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "conman"

Mon Sep 24 13:13:47 2018 rev:11 rq:637201 version:0.2.9

Changes:
--------
--- /work/SRC/openSUSE:Factory/conman/conman.changes    2018-08-24 
17:11:01.918565494 +0200
+++ /work/SRC/openSUSE:Factory/.conman.new/conman.changes       2018-09-24 
13:13:49.309648326 +0200
@@ -1,0 +2,5 @@
+Sat Sep 22 13:30:56 UTC 2018 - [email protected]
+
+- Add Requires(post): %fillup_prereq sed.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ conman.spec ++++++
--- /var/tmp/diff_new_pack.0Zk92m/_old  2018-09-24 13:13:49.765647534 +0200
+++ /var/tmp/diff_new_pack.0Zk92m/_new  2018-09-24 13:13:49.765647534 +0200
@@ -66,6 +66,8 @@
 BuildRequires:  systemd-rpm-macros
 %{?systemd_requires}
 Requires(pre):  shadow
+Requires(post): %fillup_prereq sed
+Requires(postun): coreutils
 %endif
 
 Patch1:         conman-suse-fix-expect-scripts.patch
@@ -141,15 +143,15 @@
 cat >> %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
 d %_localstatedir%_rundir/%{name} 0755 %{conman_u} %{conman_g} -
 EOF
-mkdir -p %{buildroot}%{_localstatedir}/log/%{conmandir}
+mkdir -p %{buildroot}%{_localstatedir}/log/%{?conmandir}
 %endif
 if ! grep "^SERVER" %{buildroot}/etc/conman.conf > /dev/null; then
     cat <<EOF >> %{buildroot}/etc/conman.conf
 SERVER keepalive=ON
-SERVER logdir="/var/log/%{conmandir}"
-SERVER logfile="/var/log/%{conmandir}conman.log"
+SERVER logdir="/var/log/%{?conmandir}"
+SERVER logfile="/var/log/%{?conmandir}conman.log"
 SERVER loopback=ON
-SERVER pidfile="/var/run/%{conmandir}conman.pid"
+SERVER pidfile="/var/run/%{?conmandir}conman.pid"
 SERVER tcpwrappers=ON
 SERVER timestamp=1h
 GLOBAL seropts="115200,8n1"
@@ -162,7 +164,7 @@
 %pre
 %service_add_pre conman.service
 %if 0%{?conmandir:1}
-%define conman_home "%_localstatedir%_rundir/%conmandir"
+%define conman_home "%_localstatedir%_rundir/%{?conmandir}"
 %define conman_descr "Connection Manager service"
 shopt -s nullglob
 addgrp=0; addusr=0
@@ -192,9 +194,9 @@
 [ -d %_localstatedir/lib/conman ] || mkdir %_localstatedir/lib/conman || :
 if [ $1 -eq 2 -a ! -e %_localstatedir/lib/conman/%migrated ]; then
     tmpfile=$(mktemp /tmp/tmp-XXXX)
-    sed  -e "s@^\(server\)\|\(SERVER\) \+logdir=.*@SERVER 
logdir=\"/var/log/%{conmandir}\"@" \
-       -e "s@^\(server\)\|\(SERVER\) \+logfile=.*@SERVER 
logfile=\"/var/log/%{conmandir}conman.log\"@" \
-       -e "s@^\(server\)\|\(SERVER\) \+pidfile=.*@SERVER 
pidfile=\"/var/run/%{conmandir}conman.pid\"@" \
+    sed  -e "s@^\(server\)\|\(SERVER\) \+logdir=.*@SERVER 
logdir=\"/var/log/%{?conmandir}\"@" \
+       -e "s@^\(server\)\|\(SERVER\) \+logfile=.*@SERVER 
logfile=\"/var/log/%{?conmandir}conman.log\"@" \
+       -e "s@^\(server\)\|\(SERVER\) \+pidfile=.*@SERVER 
pidfile=\"/var/run/%{?conmandir}conman.pid\"@" \
        < /etc/conman.conf > $tmpfile
     if ! cmp /etc/conman.conf $tmpfile; then
        mv /etc/conman.conf /etc/conman.conf.rpmsave


Reply via email to