Hello community,
here is the log from the commit of package haproxy for openSUSE:Factory checked
in at 2018-03-07 10:40:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/haproxy (Old)
and /work/SRC/openSUSE:Factory/.haproxy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy"
Wed Mar 7 10:40:00 2018 rev:57 rq:583731 version:1.8.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2018-03-04
12:53:11.858292996 +0100
+++ /work/SRC/openSUSE:Factory/.haproxy.new/haproxy.changes 2018-03-07
10:40:08.742644212 +0100
@@ -1,0 +2,6 @@
+Sun Mar 4 08:36:21 UTC 2018 - jeng...@inai.de
+
+- Avoid %__-type macro indirections. Remove redundant %clean
+ section. Do not ignore errors from useradd.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ haproxy.spec ++++++
--- /var/tmp/diff_new_pack.FbCmhP/_old 2018-03-07 10:40:09.698609731 +0100
+++ /var/tmp/diff_new_pack.FbCmhP/_new 2018-03-07 10:40:09.702609586 +0100
@@ -114,7 +114,7 @@
%patch3
%build
-%{__make} \
+make \
TARGET=linux2628 \
CPU="%{_target_cpu}" \
USE_PCRE=1 \
@@ -160,7 +160,7 @@
ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{pkg_name}
%else
install -D -m 0755 %{S:1}
%{buildroot}%{_sysconfdir}/init.d/%{pkg_name}
-%{__ln_s} -f %{_sysconfdir}/init.d/%{pkg_name}
%{buildroot}%{_sbindir}/rc%{pkg_name}
+ln -fs %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name}
%endif
install -d -m 0750 %{buildroot}%{pkg_home}
@@ -173,14 +173,11 @@
rm examples/haproxy.spec examples/*init* examples/haproxy.vim
-%if 0%{?suse_version} < 1230
-%clean
-%{?buildroot:%{__rm} -rf %{buildroot}}
-%endif
-
%pre
-/usr/sbin/groupadd -r %{pkg_name} >/dev/null 2>&1 ||:
-/usr/sbin/useradd -g %{pkg_name} -s /bin/false -r -c "user for %{pkg_name}"
-d %{pkg_home} %{pkg_name} >/dev/null 2>&1 || :
+getent group %{pkg_name} >/dev/null || /usr/sbin/groupadd -r %{pkg_name}
+getent passwd %{pkg_name} >/dev/null || \
+ /usr/sbin/useradd -g %{pkg_name} -s /bin/false -r \
+ -c "user for %{pkg_name}" -d %{pkg_home} %{pkg_name}
%if %{with systemd}
%service_add_pre %{pkg_name}.service
