- rebuilt for sg3_utils 1.49

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.

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)

udisks-1.0.5-fix-makedev-failure.patch

@@ -0,0 +1,77 @@
+From b0fe2367874fa0e84f4b91497c374ad7898df731 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Sat, 27 Apr 2019 08:27:12 +0100
+Subject: [PATCH] Fix build with newer glibc versions
+
+makedev() requires that sys/sysmacros.h is included.
+---
+ src/daemon.c          | 1 +
+ src/device.c          | 1 +
+ src/mount-monitor.c   | 1 +
+ tools/udisks.c        | 1 +
+ tools/umount-udisks.c | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index fafcf9a..ada2964 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -43,6 +43,7 @@
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/socket.h>
++#include <sys/sysmacros.h>
+ #include <sys/un.h>
+ #include <sys/utsname.h>
+ #include <net/if_arp.h>
+diff --git a/src/device.c b/src/device.c
+index 2ae7f38..20920df 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -33,6 +33,7 @@
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
++#include <sys/sysmacros.h>
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <grp.h>
+diff --git a/src/mount-monitor.c b/src/mount-monitor.c
+index 573a69c..0cfa167 100644
+--- a/src/mount-monitor.c
++++ b/src/mount-monitor.c
+@@ -29,6 +29,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <mntent.h>
+ 
+ #include <glib.h>
+diff --git a/tools/udisks.c b/tools/udisks.c
+index 97e80d7..599d469 100644
+--- a/tools/udisks.c
++++ b/tools/udisks.c
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/wait.h>
+ #include <fcntl.h>
+ #include <pwd.h>
+diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
+index 2813fe0..d915660 100644
+--- a/tools/umount-udisks.c
++++ b/tools/umount-udisks.c
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <grp.h>
+-- 
+2.21.0
+

udisks-1.0.5-fix-service-file.patch

@@ -0,0 +1,29 @@
+From 7d61ad048856ee239870b917d6933e3ad63f0789 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Thu, 2 Jul 2015 13:49:22 +0100
+Subject: [PATCH] Fix systemd service file
+
+udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1238664
+https://bugs.freedesktop.org/show_bug.cgi?id=91191
+---
+ data/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 411ea0f..08af5f4 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -31,7 +31,7 @@ systemdservicedir       = $(systemdsystemunitdir)
+ systemdservice_DATA     = $(systemdservice_in_files:.service.in=.service)
+ 
+ $(systemdservice_DATA): $(systemdservice_in_files) Makefile
+-	@sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@
++	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ endif
+ 
+ udevrulesdir = $(slashlibdir)/udev/rules.d
+-- 
+2.4.5
+

udisks.spec

@@ -15,14 +15,19 @@
 Summary: Storage Management Service
 Name: udisks
 Version: 1.0.5
-Release: 1%{?dist}
-License: GPLv2+
-Group: System Environment/Libraries
+Release: 34%{?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
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 # https://bugs.freedesktop.org/show_bug.cgi?id=90778
 Patch0:  udisks-1.0.5-fix-build-with-glibc-2.20.patch
 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}
 BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version}
@@ -40,6 +45,9 @@ BuildRequires: pkgconfig(libudev) >= %{udev_version}
 %endif
 BuildRequires: sg3_utils-devel >= %{sg3_utils_version}
 BuildRequires: gtk-doc
+# Needed for patch 3.
+BuildRequires: autoconf automake libtool
+BuildRequires: systemd
 # needed to pull in the system bus daemon
 Requires: dbus >= %{dbus_version}
 # needed to pull in the udev daemon
@@ -65,6 +73,9 @@ Requires: eject
 %ifnarch ppc ppc64
 Requires: ntfsprogs
 %endif
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
@@ -81,7 +92,6 @@ for managing disks and storage devices.
 
 %package devel
 Summary: D-Bus interface definitions for udisks
-Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 # See comment above
@@ -94,12 +104,18 @@ D-Bus interface definitions and documentation for udisks.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch -P0 -p1
+%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
 
+autoreconf --force --install
+
+
 %build
 %configure --enable-gtk-doc
 %make_build
@@ -123,11 +139,20 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \
 
 %find_lang %{name}
 
+%post
+%systemd_post udisks.service
+
+%preun
+%systemd_preun udisks.service
+
+%postun
+%systemd_postun_with_restart udisks.service
+
 %files -f %{name}.lang
 %doc README AUTHORS NEWS HACKING doc/TODO
 %license COPYING
 %{_sysconfdir}/avahi/services/udisks.service
-%{_sysconfdir}/bash_completion.d/
+%{_sysconfdir}/bash_completion.d/udisks-bash-completion.sh
 %{_sysconfdir}/dbus-1/system.d/*.conf
 /lib/udev/rules.d/*.rules
 
@@ -135,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*
@@ -150,14 +177,112 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \
 %attr(0700,root,root) %dir %{_localstatedir}/lib/udisks
 
 %files devel
-%defattr(-,root,root,-)
-
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/pkgconfig/udisks.pc
 %{_datadir}/gtk-doc
 
-# Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Thu Aug 20 2026 Dan Horák <dan@danny.cz> - 1.0.5-34
+- rebuilt for sg3_utils 1.49
+
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* 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
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.0.5-28
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Feb 09 2024 Dan Horák <dan@danny.cz> - 1.0.5-26
+- rebuilt for sg3_utils 1.48
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Apr 07 2021 Tomas Bzatek <tbzatek@redhat.com> - 1.0.5-19
+- rebuilt for sg3_utils 1.46
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0.5-18
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 20 2020 Dan Horák <dan@danny.cz> - 1.0.5-15
+- rebuilt for sg3_utils 1.45 (#1809392)
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Apr 27 2019 David King <amigadave@amigadave.com> - 1.0.5-12
+- Fix build failure (#1676172)
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Sep 13 2016 David King <amigadave@amigadave.com> - 1.0.5-5
+- Do not own bash completion directory (#1303443)
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jan 26 2016 David King <amigadave@amigadave.com> - 1.0.5-3
+- Remove needless use of defattr
+
+* Thu Jul 02 2015 David King <amigadave@amigadave.com> - 1.0.5-2
+- Fix systemd service file (#1238664)
+- Use systemd scriptlet snippets
+
 * Thu Jun 04 2015 David King <amigadave@amigadave.com> - 1.0.5-1
 - Update to 1.0.5 (#1075003)
 - Use license macro for COPYING