Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dhcp for openSUSE:Factory checked in at 2021-11-08 17:24:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dhcp (Old) and /work/SRC/openSUSE:Factory/.dhcp.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dhcp" Mon Nov 8 17:24:06 2021 rev:127 rq:928834 version:4.4.2.P1 Changes: -------- --- /work/SRC/openSUSE:Factory/dhcp/dhcp.changes 2021-08-16 10:13:51.862935005 +0200 +++ /work/SRC/openSUSE:Factory/.dhcp.new.1890/dhcp.changes 2021-11-08 17:24:28.812704965 +0100 @@ -1,0 +2,8 @@ +Tue Oct 26 11:58:59 UTC 2021 - Reinhard Max <[email protected]> + +- Add a fallback definition for %make_build to fix build on SLE-12. +- Handle sysusers with a bcond to improve readability and simplify + removal once we don't have to support SLE-12 anymore. +- bsc#1192020: Drop the obsolete dependency on "group(nogroup)". + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcp.spec ++++++ --- /var/tmp/diff_new_pack.eGlEYm/_old 2021-11-08 17:24:29.632705504 +0100 +++ /var/tmp/diff_new_pack.eGlEYm/_new 2021-11-08 17:24:29.636705506 +0100 @@ -26,6 +26,11 @@ %else %define sbindir /sbin %endif +%if 0%{?suse_version} >= 1330 +%bcond_without sysusers +%else +%bcond_with sysusers +%endif Name: dhcp Version: 4.4.2.P1 Release: 0 @@ -95,8 +100,7 @@ BuildRequires: dos2unix BuildRequires: libtool BuildRequires: openldap2-devel -%if 0%{?suse_version} >= 1330 -BuildRequires: sysuser-shadow +%if %{with sysusers} BuildRequires: sysuser-tools %endif @@ -105,13 +109,12 @@ Group: Productivity/Networking/Boot/Servers Requires: dhcp = %{version} Requires(post): %fillup_prereq -%systemd_ordering +%{?systemd_ordering} %if 0%{?suse_version} < 1500 Requires: net-tools %endif -%if 0%{?suse_version} >= 1330 -Requires(pre): group(nogroup) -# %sysusers_requires +%if %{with sysusers} +%sysusers_requires %else Requires(pre): shadow %endif @@ -134,7 +137,7 @@ Group: Productivity/Networking/Boot/Servers Requires: dhcp = %{version} Requires(post): %fillup_prereq -%systemd_ordering +%{?systemd_ordering} %if 0%{?suse_version} < 1500 Requires: net-tools %endif @@ -260,13 +263,17 @@ --with-srv6-lease-file=%{_localstatedir}/lib/dhcp6/db/dhcpd6.leases # : building bind sources +%if 0%{?!make_build:1} +# SLE-12 compatbility still needed as of October 2021 +%define make_build %{__make} %{?_smp_mflags} +%endif %make_build -j1 -C bind all cat bind/configure.log cat bind/build.log cat bind/install.log : building dhcp sources %make_build -%if 0%{?suse_version} >= 1330 +%if %{with sysusers} %sysusers_generate_pre %{SOURCE47} dhcp-server %endif @@ -399,14 +406,15 @@ %{buildroot}%{_includedir}/dhcp/ mv %{buildroot}%{_libdir}/lib*.* \ %{buildroot}%{_libdir}/dhcp/ -%if 0%{?suse_version} >= 1330 +%if %{with sysusers} mkdir -p %{buildroot}%{_sysusersdir} install -m 644 %{SOURCE47} %{buildroot}%{_sysusersdir}/ %endif -%if 0%{?suse_version} >= 1330 +%if %{with sysusers} %pre server -f dhcp-server.pre %else + %pre server getent passwd dhcpd >/dev/null || useradd -r -g nogroup -s /bin/false -c "DHCP server daemon" -d %{_localstatedir}/lib/dhcp dhcpd %endif @@ -479,7 +487,7 @@ %{_sbindir}/rcdhcpd6 %{_unitdir}/dhcpd.service %{_unitdir}/dhcpd6.service -%if 0%{?suse_version} >= 1330 +%if %{with sysusers} %{_sysusersdir}/dhcp-user.conf %endif %dir %{_libexecdir}/initscripts/legacy-actions/dhcpd
