Compare commits

...
Sign in to create a new pull request.

18 commits

Author SHA1 Message Date
Dan Horák
5e111e46bd - rebuilt for sg3_utils 1.49 2026-08-20 16:15:22 +02:00
Fedora Release Engineering
a1ed702bc1 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:06:39 +00:00
6af4eb7150 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.
2026-06-08 11:59:08 +01:00
Fedora Release Engineering
aa846f4aaa Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 19:32:30 +00:00
Fedora Release Engineering
ef535b8d0b Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:42:58 +00:00
Fedora Release Engineering
67e51962dc Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:37:17 +00:00
Miroslav Suchý
40bcf6c53b convert GPLv2+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-26 03:26:31 +02:00
Fedora Release Engineering
afaad5f5c1 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:08:30 +00:00
Software Management Team
9ec3169e61 Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:49 +02:00
Dan Horák
9f2737416d - rebuilt for sg3_utils 1.48 2024-02-09 19:17:05 +01:00
Fedora Release Engineering
52adc6c3c9 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 06:59:26 +00:00
Fedora Release Engineering
66c6dffef1 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 16:59:56 +00:00
Fedora Release Engineering
36eb029508 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 05:41:14 +00:00
Fedora Release Engineering
eccd7192ee Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:16:21 +00:00
Fedora Release Engineering
3f8f59176d - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:24:41 +00:00
Fedora Release Engineering
daec937307 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 19:55:44 +00:00
Tomas Bzatek
b79be836f1 - rebuilt for sg3_utils 1.46 2021-04-07 14:17:50 +02:00
2f6d8b61e9 Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
2021-03-02 16:12:06 +01:00
2 changed files with 78 additions and 8 deletions

13
sbindirinstall.diff Normal file
View file

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

View file

@ -15,8 +15,9 @@
Summary: Storage Management Service
Name: udisks
Version: 1.0.5
Release: 17%{?dist}
License: GPLv2+
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
@ -25,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}
@ -102,10 +104,11 @@ D-Bus interface definitions and documentation for udisks.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -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
@ -157,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*
@ -177,6 +182,58 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \
%{_datadir}/gtk-doc
%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