Accepting request 1054685 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1054685
OBS-URL: https://build.opensuse.org/package/show/Base:System/initviocons?expand=0&rev=16
This commit is contained in:
Dirk Mueller 2023-01-04 10:54:05 +00:00 committed by Git OBS Bridge
parent 5ae4a2502a
commit bfca13633d
2 changed files with 8 additions and 3 deletions

View File

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

View File

@ -1,7 +1,7 @@
#
# spec file for package initviocons
#
# Copyright (c) 2020 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
@ -54,7 +54,7 @@ make CFLAGS="$RPM_OPT_FLAGS -Wall"
%install
%make_install
install -m 0755 termprobes $RPM_BUILD_ROOT/%{_bindir}/termprobes
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
mkdir -p $RPM_BUILD_ROOT/bin
ln -sf %{_bindir}/initviocons $RPM_BUILD_ROOT/bin
%endif
@ -62,7 +62,7 @@ ln -sf %{_bindir}/initviocons $RPM_BUILD_ROOT/bin
%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING NEWS README
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/bin/*
%endif
%{_bindir}/*