Accepting request 927853 from home:lee_duncan:branches:network
- Fix the usr-merge changes (bsc#1192013). This includes catching all the places that /sbin was still used directly, as well as making the SPEC file build using /usr/sbin for openSUSE but still use /sbin for SLE, for now. OBS-URL: https://build.opensuse.org/request/show/927853 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=190
This commit is contained in:
parent
ea73be84cd
commit
6fb5bae1a3
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4cbbb9f3578f0d431c0c3cee3d461cbe4a3d1049d1f355db7b55ce3e7bfc68f4
|
||||
size 1238
|
||||
oid sha256:80dfef5ea8246c74aa5145050a6ae453826f238a0f722928127164c31595a13d
|
||||
size 3070
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 25 22:43:23 UTC 2021 - Lee Duncan <lduncan@suse.com>
|
||||
|
||||
- Fix the usr-merge changes (bsc#1192013). This includes catching
|
||||
all the places that /sbin was still used directly, as well as
|
||||
making the SPEC file build using /usr/sbin for openSUSE but
|
||||
still use /sbin for SLE, for now.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 5 19:23:33 UTC 2021 - Lee Duncan <lduncan@suse.com>
|
||||
|
||||
|
@ -16,6 +16,11 @@
|
||||
#
|
||||
|
||||
|
||||
# ensure usr-merge does not effect existing SLE
|
||||
%if ! 0%{?is_opensuse}
|
||||
%define _sbindir /sbin
|
||||
%endif
|
||||
|
||||
%define iscsi_minor_release 1
|
||||
%define iscsi_patch_release 5
|
||||
%define iscsi_patch_release_suse %{iscsi_patch_release}-suse
|
||||
|
Loading…
x
Reference in New Issue
Block a user