Accepting request 924642 from filesystems

OBS-URL: https://build.opensuse.org/request/show/924642
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfsprogs?expand=0&rev=69

xfsprogs.changes

@@ -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>
 

xfsprogs.spec

@@ -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]/*