Accepting request 867115 from network:utilities

- prepare usrmerge (boo#1029961) (forwarded request 849612 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/867115
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hostname?expand=0&rev=11

hostname.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 19 16:04:14 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Wed Aug 26 07:43:53 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 

hostname.spec

@@ -44,11 +44,15 @@ make %{?_smp_mflags} CFLAGS="%{optflags} -D_GNU_SOURCE"
 
 %install
 install -D -p -m 755 %{name} %{buildroot}%{_bindir}/%{name}
+%if !0%{?usrmerged}
 install -d -m 755 %{buildroot}/bin/
 ln -sf %{_bindir}/%{name} %{buildroot}/bin/%{name}
+%endif
 install -D -p -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 for prog in dnsdomainname domainname ypdomainname nisdomainname; do
+%if !0%{?usrmerged}
     ln -sf %{_bindir}/%{name} %{buildroot}/bin/$prog
+%endif
     ln -sf %{_bindir}/%{name} %{buildroot}%{_bindir}/$prog
     ln -sf hostname.1 %{buildroot}%{_mandir}/man1/${prog}.1
 done
@@ -67,11 +71,13 @@ install -p -m 0644 nis-domainname.service %{buildroot}%{_unitdir}
 %files
 %license COPYRIGHT
 %doc debian/changelog
+%if !0%{?usrmerged}
 /bin/%{name}
 /bin/domainname
 /bin/dnsdomainname
 /bin/nisdomainname
 /bin/ypdomainname
+%endif
 %{_bindir}/%{name}
 %{_bindir}/domainname
 %{_bindir}/dnsdomainname