Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dhcp for openSUSE:Factory checked in
at 2023-01-05 15:00:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dhcp (Old)
and /work/SRC/openSUSE:Factory/.dhcp.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dhcp"
Thu Jan 5 15:00:11 2023 rev:138 rq:1055819 version:4.4.2.P1
Changes:
--------
--- /work/SRC/openSUSE:Factory/dhcp/dhcp.changes 2022-12-13
18:54:59.175049221 +0100
+++ /work/SRC/openSUSE:Factory/.dhcp.new.1563/dhcp.changes 2023-01-05
15:00:20.856860478 +0100
@@ -1,0 +2,5 @@
+Tue Dec 27 10:32:19 UTC 2022 - Ludwig Nussel <lnus...@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check
(boo#1206798)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dhcp.spec ++++++
--- /var/tmp/diff_new_pack.ccgJ74/_old 2023-01-05 15:00:21.736865117 +0100
+++ /var/tmp/diff_new_pack.ccgJ74/_new 2023-01-05 15:00:21.744865160 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dhcp
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
%define sbindir %{_sbindir}
%else
%define sbindir /sbin
@@ -305,7 +305,7 @@
install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/%{_lib}
install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/run
install -d -m0755 %{buildroot}%{_localstatedir}/lib/{dhcp,dhcp6}/db
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
# move the dhclient binary to /sbin
mv -f %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/
%endif
