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.spec b/udisks.spec index 6eeeddb..fa404e5 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,9 +15,8 @@ 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: 18%{?dist} +License: GPLv2+ 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 @@ -26,7 +25,6 @@ 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} @@ -104,11 +102,10 @@ 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 +%patch3 -p1 # https://bugzilla.redhat.com/show_bug.cgi?id=673544#c15 rm -f src/*-glue.h tools/*-glue.h @@ -160,11 +157,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* @@ -182,58 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %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 +* Tue Apr 06 2021 Tomas Bzatek - 1.0.5-18 - 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