diff --git a/sbindirinstall.diff b/sbindirinstall.diff deleted file mode 100644 index 7c28be4..0000000 --- a/sbindirinstall.diff +++ /dev/null @@ -1,13 +0,0 @@ -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-1.0.5-fix-makedev-failure.patch b/udisks-1.0.5-fix-makedev-failure.patch deleted file mode 100644 index 3b23f74..0000000 --- a/udisks-1.0.5-fix-makedev-failure.patch +++ /dev/null @@ -1,77 +0,0 @@ -From b0fe2367874fa0e84f4b91497c374ad7898df731 Mon Sep 17 00:00:00 2001 -From: David King -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 - #include - #include -+#include - #include - #include - #include -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 - #include - #include -+#include - #include - #include - #include -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 - #include - #include -+#include - #include - - #include -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 - #include - #include -+#include - #include - #include - #include -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 - #include - #include -+#include - #include - #include - #include --- -2.21.0 - diff --git a/udisks.spec b/udisks.spec index 6eeeddb..fb9b806 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,9 +15,9 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 34%{?dist} -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +Release: 2%{?dist} +License: GPLv2+ +Group: System Environment/Libraries 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 @@ -25,9 +25,6 @@ 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} @@ -92,6 +89,7 @@ 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 @@ -104,11 +102,9 @@ D-Bus interface definitions and documentation for udisks. %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 # https://bugzilla.redhat.com/show_bug.cgi?id=673544#c15 rm -f src/*-glue.h tools/*-glue.h @@ -152,7 +148,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %doc README AUTHORS NEWS HACKING doc/TODO %license COPYING %{_sysconfdir}/avahi/services/udisks.service -%{_sysconfdir}/bash_completion.d/udisks-bash-completion.sh +%{_sysconfdir}/bash_completion.d/ %{_sysconfdir}/dbus-1/system.d/*.conf /lib/udev/rules.d/*.rules @@ -160,11 +156,9 @@ 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 -%{_sbindir}/umount.udisks +/sbin/umount.udisks -%{_bindir}/devkit-disks -%{_bindir}/udisks -%{_bindir}/udisks-tcp-bridge +%{_bindir}/* %{_libexecdir}/* %{_mandir}/man1/*.1* %{_mandir}/man7/%{name}.7* @@ -177,108 +171,14 @@ 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 - 1.0.5-34 -- rebuilt for sg3_utils 1.49 - -* Fri Jul 17 2026 Fedora Release Engineering - 1.0.5-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Mon Jun 08 2026 Zbigniew Jędrzejewski-Szmek - 1.0.5-32 -- Move umount.udisks to /usr/bin - -* Sat Jan 17 2026 Fedora Release Engineering - 1.0.5-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.0.5-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.0.5-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 1.0.5-28 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.0.5-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Feb 09 2024 Dan Horák - 1.0.5-26 -- rebuilt for sg3_utils 1.48 - -* Sat Jan 27 2024 Fedora Release Engineering - 1.0.5-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.0.5-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.0.5-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.0.5-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.0.5-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.0.5-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Apr 07 2021 Tomas Bzatek - 1.0.5-19 -- rebuilt for sg3_utils 1.46 - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.0.5-18 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Wed Jan 27 2021 Fedora Release Engineering - 1.0.5-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.0.5-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Apr 20 2020 Dan Horák - 1.0.5-15 -- rebuilt for sg3_utils 1.45 (#1809392) - -* Fri Jan 31 2020 Fedora Release Engineering - 1.0.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.0.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Apr 27 2019 David King - 1.0.5-12 -- Fix build failure (#1676172) - -* Sun Feb 03 2019 Fedora Release Engineering - 1.0.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.0.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.0.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.0.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.0.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.0.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Sep 13 2016 David King - 1.0.5-5 -- Do not own bash completion directory (#1303443) - -* Fri Feb 05 2016 Fedora Release Engineering - 1.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 26 2016 David King - 1.0.5-3 -- Remove needless use of defattr - * Thu Jul 02 2015 David King - 1.0.5-2 - Fix systemd service file (#1238664) - Use systemd scriptlet snippets