[rpms/udisks] rawhide: Use the %_sbindir macro for location of umount.udisks

[rpms/udisks] rawhide: Use the %_sbindir macro for location of umount.udisks

[@ 2026-06-08 11:00 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/udisks
            Branch : rawhide
            Commit : 6af4eb71502d9a2ad7916d0fa97bf8224da88d1f
            Author : Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
            Date   : 2026-06-08T11:59:08+01:00
            Stats  : +23/-3 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/udisks/c/6af4eb71502d9a2ad7916d0fa97bf8224da88d1f?branch=rawhide

            Log:
            Use the %_sbindir macro for location of umount.udisks

This way, it'll be moved to /usr/bin on systems where %_sbindir is
configured so. It'll still be accessible through the old location
thanks to the magic of symlinks. Moving of the file is important to
let the merge of /usr/sbin to be finished on upgraded systems.

While at it, stop using a glob for files in /usr/bin. Globs are
frowned upon for files in shared directories.

---
diff --git a/sbindirinstall.diff b/sbindirinstall.diff
new file mode 100644
index 0000000..7c28be4
--- /dev/null
+++ b/sbindirinstall.diff
@@ -0,0 +1,13 @@
+diff --git udisks-1.0.5/tools/Makefile.am~ udisks-1.0.5/tools/Makefile.am
+index 18325f7358..0aaec111ca 100644
+--- udisks-1.0.5/tools/Makefile.am~
++++ udisks-1.0.5/tools/Makefile.am
+@@ -54,7 +54,7 @@ udisks_LDADD = 						\
+ 	$(DBUS_GLIB_LIBS)				\
+ 	$(POLKIT_DBUS_LIBS)
+ 
+-slashsbin_PROGRAMS = umount.udisks
++sbin_PROGRAMS = umount.udisks
+ 
+ umount_udisks_SOURCES = umount-udisks.c
+ umount_udisks_LDADD = $(DBUS_GLIB_LIBS) $(POLKIT_DBUS_LIBS)

diff --git a/udisks.spec b/udisks.spec
index 68352c2..d37c0bb 100644
--- a/udisks.spec
+++ b/udisks.spec
@@ -15,7 +15,7 @@
 Summary: Storage Management Service
 Name: udisks
 Version: 1.0.5
-Release: 31%{?dist}
+Release: 32%{?dist}
 # Automatically converted from old format: GPLv2+ - review is highly recommended.
 License: GPL-2.0-or-later
 URL: http://www.freedesktop.org/wiki/Software/udisks
@@ -26,6 +26,7 @@ Patch1:  fix_bash_completion.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1238664
 Patch2:  udisks-1.0.5-fix-service-file.patch
 Patch3:  udisks-1.0.5-fix-makedev-failure.patch
+Patch4:  sbindirinstall.diff
 BuildRequires: make
 BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(dbus-1)  >= %{dbus_version}
@@ -107,6 +108,7 @@ D-Bus interface definitions and documentation for udisks.
 %patch -P1 -p1
 %patch -P2 -p1
 %patch -P3 -p1
+%patch -P4 -p1
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=673544#c15
 rm -f src/*-glue.h tools/*-glue.h
@@ -158,9 +160,11 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \
 /lib/udev/udisks-dm-export
 /lib/udev/udisks-probe-ata-smart
 /lib/udev/udisks-probe-sas-expander
-/sbin/umount.udisks
+%{_sbindir}/umount.udisks
 
-%{_bindir}/*
+%{_bindir}/devkit-disks
+%{_bindir}/udisks
+%{_bindir}/udisks-tcp-bridge
 %{_libexecdir}/*
 %{_mandir}/man1/*.1*
 %{_mandir}/man7/%{name}.7*
@@ -178,6 +182,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Jun 08 2026 Zbigniew Jędrzejewski-Szmek  <zbyszek@in.waw.pl> - 1.0.5-32
+- Move umount.udisks to /usr/bin
+
 * Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild