rpm/hostname
SHA256
1
0
Fork 0
forked from pool/hostname
Code Pull Requests Activity

Accepting request 1054650 from home:lnussel:usrmerge

Browse Source 
Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1054650
OBS-URL: https://build.opensuse.org/package/show/network:utilities/hostname?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2023-03-20 14:02:24 +00:00 committed by Git OBS Bridge
parent 442be326b5
commit d65e322de5
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hostname.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 12:26:47 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 19 16:04:14 UTC 2020 - Ludwig Nussel <lnussel@suse.de> Mon Oct 19 16:04:14 UTC 2020 - Ludwig Nussel <lnussel@suse.de>

8
hostname.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package hostname # spec file for package hostname
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -44,13 +44,13 @@ 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} %if 0%{?suse_version} < 1550
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 %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} %if 0%{?suse_version} < 1550
ln -sf %{_bindir}/%{name} %{buildroot}/bin/$prog ln -sf %{_bindir}/%{name} %{buildroot}/bin/$prog
%endif %endif
ln -sf %{_bindir}/%{name} %{buildroot}%{_bindir}/$prog ln -sf %{_bindir}/%{name} %{buildroot}%{_bindir}/$prog
@ -71,7 +71,7 @@ install -p -m 0644 nis-domainname.service %{buildroot}%{_unitdir}
%files %files
%license COPYRIGHT %license COPYRIGHT
%doc debian/changelog %doc debian/changelog
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/bin/%{name} /bin/%{name}
/bin/domainname /bin/domainname
/bin/dnsdomainname /bin/dnsdomainname