pool/xfsprogs
3
0
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 922422 from home:ailiopoulos:branches:filesystems

Browse Source 
- move fsck.xfs, mkfs.xfs and xfs_repair from /sbin to /usr/sbin
  (bsc#1191105)

  The default rpmbuild %configure macro passes --sbindir=/usr/sbin to
  every configure script, but the xfsprogs configure script ignores it
  when --exec-prefix is also set. Unset --exec-prefix since it is not
  really required (all other paths are explicitly passed via the rpm
  configure macro), so that the --sbindir is respected.

OBS-URL: https://build.opensuse.org/request/show/922422
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsprogs?expand=0&rev=108
This commit is contained in:
Anthony Iliopoulos 2021-10-11 09:44:43 +00:00 committed by Git OBS Bridge
parent 586eb2be4a
commit a75095374a
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xfsprogs.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Sep 30 16:43:35 UTC 2021 - Anthony Iliopoulos <ailiop@suse.com>
- move fsck.xfs, mkfs.xfs and xfs_repair from /sbin to /usr/sbin
(bsc#1191105)
The default rpmbuild %configure macro passes --sbindir=/usr/sbin to
every configure script, but the xfsprogs configure script ignores it
when --exec-prefix is also set. Unset --exec-prefix since it is not
really required (all other paths are explicitly passed via the rpm
configure macro), so that the --sbindir is respected.
-------------------------------------------------------------------
Sun Aug 22 17:11:35 UTC 2021 - Anthony Iliopoulos <ailiop@suse.com>

5
xfsprogs.spec
View File

@ -122,6 +122,7 @@ export DEBUG=-DNDEBUG
export LIBUUID=%{_libdir}/libuuid.a
%configure \
--exec-prefix="" \
--enable-editline=yes \
%if %{with systemd}
--with-systemd-unit-dir=%{_unitdir} \
@ -142,7 +143,6 @@ make install-dev
# remove the static libs and libtool archive
rm -rf %{buildroot}/%{_lib}/*.{la,a}
rm -rf %{buildroot}/%{_libdir}/*.{la,a}
mv %{buildroot}/%{_lib}/* %{buildroot}%{_libdir}
%find_lang %{name}
install -m 0755 -d %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
install -m 0755 module-setup.sh %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
@ -175,9 +175,6 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/
%files -f %{name}.lang
%defattr(-,root,root,755)
#UsrMerge
/sbin/*
#EndUsrMerge
%{_sbindir}/*
%exclude %{_sbindir}/xfs_scrub_all
%{_mandir}/man[258]/*