Accepting request 1055750 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055750
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=481
This commit is contained in:
Jan Engelhardt 2023-01-04 11:41:01 +00:00 committed by Git OBS Bridge
parent 98e95d2aba
commit 7fb029c751
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 13:23:29 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Wed Dec 21 17:11:27 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -40,7 +40,7 @@
%define ulbuild python
%endif
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
%define ul_extra_bin_sbin 1
%else
%define ul_extra_bin_sbin 0