ailiopoulos/ocfs2-tools
1
0
Fork 0
forked from pool/ocfs2-tools
Code Pull Requests Activity

Accepting request 1030854 from home:hmzhao:branches:network:ha-clustering:Factory

Browse Source 
- ocfs2-tools: finish UsrMerge, install to /usr (bsc#1191084)
  + modify ocfs2_tools.spec to use %suse_version to replace %UsrMerge

OBS-URL: https://build.opensuse.org/request/show/1030854
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=148
This commit is contained in:
heming zhao 2022-10-24 11:16:46 +00:00 committed by Git OBS Bridge
parent a35776f519
commit cd6c688c45
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ocfs2-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 24 10:06:00 UTC 2022 - heming.zhao@suse.com
- ocfs2-tools: finish UsrMerge, install to /usr (bsc#1191084)
+ modify ocfs2_tools.spec to use %suse_version to replace %UsrMerge
-------------------------------------------------------------------
Sat Oct 22 08:40:00 UTC 2022 - heming.zhao@suse.com

6
ocfs2-tools.spec
View File

@ -22,7 +22,7 @@
%endif
#see bsc#1191084
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
# for SLEs
%define sbindir /sbin
%else
@ -194,7 +194,7 @@ autoreconf -fi -I /usr/share/aclocal
%endif
--enable-dynamic-fsck=yes \
--enable-dynamic-ctl=yes \
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
# "do nothing"
%else
--with-root-prefix=/usr
@ -235,7 +235,7 @@ cd reflink
make DESTDIR="%{buildroot}" install
cd ..
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
mv %{buildroot}/{,/usr}/sbin/o2image
mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2
#mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk