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
This commit is contained in:
Dominique Leuenberger 2021-02-07 14:13:40 +00:00 committed by Git OBS Bridge
commit 6d85478c2d
2 changed files with 11 additions and 0 deletions

View File

@ -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> Wed Aug 26 07:43:53 UTC 2020 - Dirk Mueller <dmueller@suse.com>

View File

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