From 78f10471a10ce42c7bdc603c702c0492f3753156 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 00:22:38 -0500 Subject: [PATCH 01/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 4886efc..2466ff0 100644 --- a/udisks.spec +++ b/udisks.spec @@ -14,7 +14,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.4 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -159,6 +159,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.0.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Feb 26 2013 Ville Skyttä - 1.0.4-11 - Move bash completion to %%{_sysconfdir}/bash_completion.d (#584569). From 1bd17e4406bdc13aea5e5dd78315797524f14a03 Mon Sep 17 00:00:00 2001 From: Huzaifa Sidhpurwala Date: Fri, 14 Mar 2014 10:57:14 +0530 Subject: [PATCH 02/48] Resolves: 1074458 --- .gitignore | 1 + sources | 1 + udisks.spec | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9212a1b..9484f0c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ udisks-1.0.1.tar.gz /udisks-1.0.2.tar.gz /udisks-1.0.3.tar.gz /udisks-1.0.4.tar.gz +/buffer-overflow.patch diff --git a/sources b/sources index 9406fae..7694cf0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 86c63b2b5484f2060499a052b5b6256b udisks-1.0.4.tar.gz +55a027cbee416985f9998bd8fbd016d3 buffer-overflow.patch diff --git a/udisks.spec b/udisks.spec index 2466ff0..32f4565 100644 --- a/udisks.spec +++ b/udisks.spec @@ -14,7 +14,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.4 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -72,6 +72,7 @@ Provides: DeviceKit-disks = 010 Patch0: udisks-1.0.4-neuter-stdout-and-stderr.patch Patch1: fix_bash_completion.patch +Patch2: buffer-overflow.patch %description udisks provides a daemon, D-Bus API and command line tools @@ -94,6 +95,7 @@ D-Bus interface definitions and documentation for udisks. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 -b .buffer-overflow # https://bugzilla.redhat.com/show_bug.cgi?id=673544#c15 rm -f src/*-glue.h tools/*-glue.h @@ -159,6 +161,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Fri Mar 14 2014 Huzaifa Sidhpurwala - 1.0.4-13 +- fix CVE-2014-0004 + * Sun Aug 04 2013 Fedora Release Engineering - 1.0.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 7a090576f997fb93d0598afa4a4761de9e2af4ff Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:32:18 -0500 Subject: [PATCH 03/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 32f4565..81f302b 100644 --- a/udisks.spec +++ b/udisks.spec @@ -14,7 +14,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.4 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -161,6 +161,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.0.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Mar 14 2014 Huzaifa Sidhpurwala - 1.0.4-13 - fix CVE-2014-0004 From bfeb2c348bf509a47f849541a4656fb270ef9842 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 06:43:34 +0000 Subject: [PATCH 04/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 81f302b..374e60e 100644 --- a/udisks.spec +++ b/udisks.spec @@ -14,7 +14,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.4 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -161,6 +161,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.0.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.0.4-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 38ae0ae0cb05dec11596ce3cd1bf9ee18ec42baa Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 21 Feb 2015 22:23:53 +0100 Subject: [PATCH 05/48] Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code --- udisks.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 374e60e..42cfa25 100644 --- a/udisks.spec +++ b/udisks.spec @@ -14,7 +14,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.4 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -161,6 +161,10 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Sat Feb 21 2015 Till Maas - 1.0.4-16 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + * Mon Aug 18 2014 Fedora Release Engineering - 1.0.4-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 78e8f9a1e1c8a823ed0d24d6dc3a836ffc658a26 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 1 Jun 2015 17:33:59 +0100 Subject: [PATCH 06/48] Update to 1.0.5 (#1075003) --- .gitignore | 1 + sources | 3 +- udisks-1.0.4-neuter-stdout-and-stderr.patch | 74 -------------------- udisks-1.0.5-fix-build-with-glibc-2.20.patch | 25 +++++++ udisks.spec | 16 +++-- 5 files changed, 36 insertions(+), 83 deletions(-) delete mode 100644 udisks-1.0.4-neuter-stdout-and-stderr.patch create mode 100644 udisks-1.0.5-fix-build-with-glibc-2.20.patch diff --git a/.gitignore b/.gitignore index 9484f0c..36518a5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ udisks-1.0.1.tar.gz /udisks-1.0.3.tar.gz /udisks-1.0.4.tar.gz /buffer-overflow.patch +/udisks-1.0.5.tar.gz diff --git a/sources b/sources index 7694cf0..aec0f08 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -86c63b2b5484f2060499a052b5b6256b udisks-1.0.4.tar.gz -55a027cbee416985f9998bd8fbd016d3 buffer-overflow.patch +70d48dcfe523a74cd7c7fbbc2847fcdd udisks-1.0.5.tar.gz diff --git a/udisks-1.0.4-neuter-stdout-and-stderr.patch b/udisks-1.0.4-neuter-stdout-and-stderr.patch deleted file mode 100644 index 95cceb9..0000000 --- a/udisks-1.0.4-neuter-stdout-and-stderr.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 072654b3ea2591e05cfbe80c06a00858e63f1f1a Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Tue, 18 Oct 2011 12:19:22 -0400 -Subject: [PATCH] udisks-daemon: Add --no-debug option and use this for D-Bus - activation - -Signed-off-by: David Zeuthen ---- - data/org.freedesktop.UDisks.service.in | 2 +- - src/main.c | 28 ++++++++++++++++++++++++---- - 2 files changed, 25 insertions(+), 5 deletions(-) - -diff --git a/data/org.freedesktop.UDisks.service.in b/data/org.freedesktop.UDisks.service.in -index b3606a6..bc3542a 100644 ---- a/data/org.freedesktop.UDisks.service.in -+++ b/data/org.freedesktop.UDisks.service.in -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=org.freedesktop.UDisks --Exec=@libexecdir@/udisks-daemon -+Exec=@libexecdir@/udisks-daemon --no-debug - User=root - -diff --git a/src/main.c b/src/main.c -index 318db27..6e220b1 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -141,12 +141,13 @@ main (int argc, - static char *helper_dir = NULL; - char *path; - int ret; -- static gboolean replace; -+ static gboolean replace = FALSE; -+ static gboolean no_debug = FALSE; - static GOptionEntry entries[] = - { -- { "replace", 0, 0, G_OPTION_ARG_NONE, &replace, "Replace existing daemon", NULL }, -- { "helper-dir", 0, G_OPTION_FLAG_FILENAME, G_OPTION_ARG_STRING, -- &helper_dir, "Directory for helper tools", NULL }, -+ { "no-debug", 'n', 0, G_OPTION_ARG_NONE, &no_debug, "Don't print debug information", NULL }, -+ { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace, "Replace existing daemon", NULL }, -+ { "helper-dir", 0, 0, G_OPTION_ARG_FILENAME, &helper_dir, "Directory for helper tools", NULL }, - { NULL } }; - - PROFILE ("main(): start"); -@@ -181,6 +182,25 @@ main (int argc, - g_option_context_parse (context, &argc, &argv, NULL); - g_option_context_free (context); - -+ /* If --no-debug is requested don't clutter stdout/stderr etc. -+ */ -+ if (no_debug) -+ { -+ gint dev_null_fd; -+ dev_null_fd = open ("/dev/null", O_RDWR); -+ if (dev_null_fd >= 0) -+ { -+ dup2 (dev_null_fd, STDIN_FILENO); -+ dup2 (dev_null_fd, STDOUT_FILENO); -+ dup2 (dev_null_fd, STDERR_FILENO); -+ close (dev_null_fd); -+ } -+ else -+ { -+ g_warning ("Error opening /dev/null: %m"); -+ } -+ } -+ - /* run with a controlled path */ - if (helper_dir != NULL) - path = g_strdup_printf ("%s:" PACKAGE_LIBEXEC_DIR ":/sbin:/bin:/usr/sbin:/usr/bin", helper_dir); --- -1.7.6.4 - diff --git a/udisks-1.0.5-fix-build-with-glibc-2.20.patch b/udisks-1.0.5-fix-build-with-glibc-2.20.patch new file mode 100644 index 0000000..85ef520 --- /dev/null +++ b/udisks-1.0.5-fix-build-with-glibc-2.20.patch @@ -0,0 +1,25 @@ +From 0aa652a7b257f98f9e8e7dc7b0ddc9bc62377d09 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Fri, 29 May 2015 21:09:39 -0400 +Subject: [PATCH] Bug 90778 - fix build with newer glibc versions + +https://bugs.freedesktop.org/show_bug.cgi?id=90778 +--- + src/helpers/job-drive-detach.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c +index eeafcab..d122a1f 100644 +--- a/src/helpers/job-drive-detach.c ++++ b/src/helpers/job-drive-detach.c +@@ -18,6 +18,7 @@ + * + */ + ++#include + #include + #include + #include +-- +2.4.2 + diff --git a/udisks.spec b/udisks.spec index 42cfa25..cf5ef2b 100644 --- a/udisks.spec +++ b/udisks.spec @@ -13,12 +13,15 @@ Summary: Storage Management Service Name: udisks -Version: 1.0.4 -Release: 16%{?dist} +Version: 1.0.5 +Release: 1%{?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 +Patch0: udisks-1.0.5-fix-build-with-glibc-2.20.patch +Patch1: fix_bash_completion.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -70,10 +73,6 @@ Conflicts: kernel < 2.6.26 Obsoletes: DeviceKit-disks <= 009 Provides: DeviceKit-disks = 010 -Patch0: udisks-1.0.4-neuter-stdout-and-stderr.patch -Patch1: fix_bash_completion.patch -Patch2: buffer-overflow.patch - %description udisks provides a daemon, D-Bus API and command line tools for managing disks and storage devices. @@ -95,7 +94,6 @@ D-Bus interface definitions and documentation for udisks. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -b .buffer-overflow # https://bugzilla.redhat.com/show_bug.cgi?id=673544#c15 rm -f src/*-glue.h tools/*-glue.h @@ -149,6 +147,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/polkit-1/actions/*.policy %{_datadir}/dbus-1/system-services/*.service +%{_unitdir}/udisks.service %attr(0700,root,root) %dir %{_localstatedir}/lib/udisks @@ -161,6 +160,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Thu Jun 04 2015 David King - 1.0.5-1 +- Update to 1.0.5 (#1075003) + * Sat Feb 21 2015 Till Maas - 1.0.4-16 - Rebuilt for Fedora 23 Change https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code From 9b8a4517f14fb97138126fd7092c9ff1fb7c81f7 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 4 Jun 2015 12:05:07 +0100 Subject: [PATCH 07/48] Use license macro for COPYING https://fedoraproject.org/wiki/Packaging:LicensingGuidelines#License_Text --- udisks.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/udisks.spec b/udisks.spec index cf5ef2b..71ca0ce 100644 --- a/udisks.spec +++ b/udisks.spec @@ -122,10 +122,8 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %find_lang %{name} %files -f %{name}.lang -%defattr(-,root,root,-) - -%doc README AUTHORS NEWS COPYING HACKING doc/TODO - +%doc README AUTHORS NEWS HACKING doc/TODO +%license COPYING %{_sysconfdir}/avahi/services/udisks.service %{_sysconfdir}/bash_completion.d/ %{_sysconfdir}/dbus-1/system.d/*.conf @@ -162,6 +160,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %changelog * Thu Jun 04 2015 David King - 1.0.5-1 - Update to 1.0.5 (#1075003) +- Use license macro for COPYING * Sat Feb 21 2015 Till Maas - 1.0.4-16 - Rebuilt for Fedora 23 Change From 9a07b3300c42a9d2a01a1a1346a257c64666bf47 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 4 Jun 2015 12:18:11 +0100 Subject: [PATCH 08/48] Use pkgconfig for BuildRequires https://fedoraproject.org/wiki/Packaging:PkgConfigBuildRequires --- udisks.spec | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/udisks.spec b/udisks.spec index 71ca0ce..61a9c34 100644 --- a/udisks.spec +++ b/udisks.spec @@ -1,15 +1,16 @@ -%define glib2_version 2.6.0 -%define dbus_version 1.2 -%define dbus_glib_version 0.82 -%define polkit_version 0.92 -%define parted_version 1.8.8 -%define udev_version 145 -%define mdadm_version 2.6.7 -%define device_mapper_version 1.02 -%define libatasmart_version 0.12 -%define sg3_utils_version 1.27 -%define smp_utils_version 0.94 -%define systemd_version 185 +%global dbus_version 1.2 +%global dbus_glib_version 0.82 +%global glib2_version 2.15.0 +%global gudev_version 147 +%global polkit_version 0.97 +%global parted_version 1.8.8 +%global udev_version 143 +%global mdadm_version 2.6.7 +%global device_mapper_version 1.02 +%global libatasmart_version 0.14 +%global sg3_utils_version 1.27 +%global smp_utils_version 0.94 +%global systemd_version 185 Summary: Storage Management Service Name: udisks @@ -22,19 +23,20 @@ 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 -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: dbus-glib-devel >= %{dbus_glib_version} -BuildRequires: polkit-devel >= %{polkit_version} +BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(dbus-1) >= %{dbus_version} +BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version} +BuildRequires: pkgconfig(polkit-gobject-1) >= %{polkit_version} BuildRequires: parted-devel >= %{parted_version} -BuildRequires: device-mapper-devel >= %{device_mapper_version} +BuildRequires: pkgconfig(devmapper) >= %{device_mapper_version} +BuildRequires: pkgconfig(libudev) >= %{udev_version} BuildRequires: intltool -BuildRequires: libatasmart-devel >= %{libatasmart_version} -BuildRequires: libgudev1-devel >= %{udev_version} +BuildRequires: pkgconfig(libatasmart) >= %{libatasmart_version} +BuildRequires: pkgconfig(gudev-1.0) >= %{gudev_version} %if 0%{?fedora} > 17 || 0%{?rhel} > 6 -BuildRequires: systemd-devel >= %{systemd_version} +BuildRequires: pkgconfig(systemd) >= %{systemd_version} %else -BuildRequires: libudev-devel >= %{udev_version} +BuildRequires: pkgconfig(libudev) >= %{udev_version} %endif BuildRequires: sg3_utils-devel >= %{sg3_utils_version} BuildRequires: gtk-doc @@ -161,6 +163,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ * Thu Jun 04 2015 David King - 1.0.5-1 - Update to 1.0.5 (#1075003) - Use license macro for COPYING +- Use pkgconfig for BuildRequires * Sat Feb 21 2015 Till Maas - 1.0.4-16 - Rebuilt for Fedora 23 Change From 0a959ae2db5d461e0a6bde8d94db5ab7fc3c771b Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 4 Jun 2015 12:25:34 +0100 Subject: [PATCH 09/48] Use SMP flags when building --- udisks.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 61a9c34..b1cdfee 100644 --- a/udisks.spec +++ b/udisks.spec @@ -102,7 +102,7 @@ rm -f src/*-glue.h tools/*-glue.h %build %configure --enable-gtk-doc -make +%make_build %install make install DESTDIR=$RPM_BUILD_ROOT @@ -164,6 +164,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ - Update to 1.0.5 (#1075003) - Use license macro for COPYING - Use pkgconfig for BuildRequires +- Use SMP flags when building * Sat Feb 21 2015 Till Maas - 1.0.4-16 - Rebuilt for Fedora 23 Change From 4ade574b7ad16a7e9a36cef3fa8106610101a51e Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 4 Jun 2015 12:26:26 +0100 Subject: [PATCH 10/48] Preserve timestamps during install --- udisks.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index b1cdfee..8c12898 100644 --- a/udisks.spec +++ b/udisks.spec @@ -105,7 +105,7 @@ rm -f src/*-glue.h tools/*-glue.h %make_build %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a @@ -165,6 +165,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ - Use license macro for COPYING - Use pkgconfig for BuildRequires - Use SMP flags when building +- Preserve timestamps during install * Sat Feb 21 2015 Till Maas - 1.0.4-16 - Rebuilt for Fedora 23 Change From 23bb854ecbe4314abb640bcb791f9ea21e6a46d3 Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 4 Jun 2015 12:30:26 +0100 Subject: [PATCH 11/48] Update man page globs in files section https://fedoraproject.org/wiki/Packaging:Guidelines#Manpages --- udisks.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/udisks.spec b/udisks.spec index 8c12898..ecf8191 100644 --- a/udisks.spec +++ b/udisks.spec @@ -139,11 +139,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_bindir}/* %{_libexecdir}/* - -%{_mandir}/man1/* -%{_mandir}/man7/* -%{_mandir}/man8/* - +%{_mandir}/man1/*.1* +%{_mandir}/man7/%{name}.7* +%{_mandir}/man8/%{name}-daemon.8* %{_datadir}/polkit-1/actions/*.policy %{_datadir}/dbus-1/system-services/*.service @@ -166,6 +164,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ - Use pkgconfig for BuildRequires - Use SMP flags when building - Preserve timestamps during install +- Update man page globs in files section * Sat Feb 21 2015 Till Maas - 1.0.4-16 - Rebuilt for Fedora 23 Change From d107ee165a21fe2bf3a845b1fde9bdb3c7dd84bb Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 2 Jul 2015 13:57:47 +0100 Subject: [PATCH 12/48] Fix systemd service file (#1238664) --- udisks-1.0.5-fix-service-file.patch | 29 +++++++++++++++++++++++++++++ udisks.spec | 13 ++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 udisks-1.0.5-fix-service-file.patch diff --git a/udisks-1.0.5-fix-service-file.patch b/udisks-1.0.5-fix-service-file.patch new file mode 100644 index 0000000..9b3a999 --- /dev/null +++ b/udisks-1.0.5-fix-service-file.patch @@ -0,0 +1,29 @@ +From 7d61ad048856ee239870b917d6933e3ad63f0789 Mon Sep 17 00:00:00 2001 +From: David King +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 + diff --git a/udisks.spec b/udisks.spec index ecf8191..bc146d0 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -23,6 +23,8 @@ 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 BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} BuildRequires: pkgconfig(dbus-1) >= %{dbus_version} BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version} @@ -40,6 +42,8 @@ BuildRequires: pkgconfig(libudev) >= %{udev_version} %endif BuildRequires: sg3_utils-devel >= %{sg3_utils_version} BuildRequires: gtk-doc +# Needed for patch 3. +BuildRequires: autoconf automake libtool # needed to pull in the system bus daemon Requires: dbus >= %{dbus_version} # needed to pull in the udev daemon @@ -96,10 +100,14 @@ D-Bus interface definitions and documentation for udisks. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -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 @@ -158,6 +166,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Thu Jul 02 2015 David King - 1.0.5-2 +- Fix systemd service file (#1238664) + * Thu Jun 04 2015 David King - 1.0.5-1 - Update to 1.0.5 (#1075003) - Use license macro for COPYING From 26b4059d39bb8701df63105be58961e5014cc6ae Mon Sep 17 00:00:00 2001 From: David King Date: Thu, 2 Jul 2015 14:00:48 +0100 Subject: [PATCH 13/48] Use systemd scriptlet snippets https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd --- udisks.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/udisks.spec b/udisks.spec index bc146d0..fb9b806 100644 --- a/udisks.spec +++ b/udisks.spec @@ -44,6 +44,7 @@ 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 @@ -69,6 +70,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 @@ -131,6 +135,15 @@ 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 @@ -168,6 +181,7 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %changelog * Thu Jul 02 2015 David King - 1.0.5-2 - Fix systemd service file (#1238664) +- Use systemd scriptlet snippets * Thu Jun 04 2015 David King - 1.0.5-1 - Update to 1.0.5 (#1075003) From e87cd2dbc385d572f99dac59e8d11a0744d2aa73 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 26 Jan 2016 08:20:21 +0000 Subject: [PATCH 14/48] Remove needless use of defattr https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/KEO7AX3JXR2TY6OVL4M7HDISZ6YIJNKU/ --- udisks.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/udisks.spec b/udisks.spec index fb9b806..ed06c73 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -171,14 +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 +* 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 From 902521ff372b94d3993fe82ec1bdc1182a243b64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:15:04 +0000 Subject: [PATCH 15/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index ed06c73..2bc6702 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 5738f84ae71f581af843792f4e5202b79d8594ea Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 14 Sep 2016 08:39:25 +0200 Subject: [PATCH 16/48] Do not own bash completion directory (#1303443) --- udisks.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/udisks.spec b/udisks.spec index 2bc6702..e40eebe 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -148,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/ +%{_sysconfdir}/bash_completion.d/udisks-bash-completion.sh %{_sysconfdir}/dbus-1/system.d/*.conf /lib/udev/rules.d/*.rules @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 23800707409536b4666028c685a7a33c610090d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:37:38 +0000 Subject: [PATCH 17/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index e40eebe..417eb2b 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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) From 8ec7abdd2b7c449f9b311b5852cb537006b57ac4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 20:53:23 +0000 Subject: [PATCH 18/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 417eb2b..5b7ed18 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From a57ad690e84332d351f72f919ce3a1c9f69eabb9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:43:00 +0000 Subject: [PATCH 19/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 5b7ed18..332cdaa 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 22c75952454060b80dff7366620f37c7f41a2b72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 19:53:04 +0000 Subject: [PATCH 20/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 332cdaa..6658cf6 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From bbcdd02f9a3caa5027546b9e945be2e27c0066ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:09:01 +0000 Subject: [PATCH 21/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 6658cf6..0f377ba 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 81a394a7ecc98ae7f7610083a19e6a7220319f79 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 22/48] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- udisks.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/udisks.spec b/udisks.spec index 0f377ba..26199dc 100644 --- a/udisks.spec +++ b/udisks.spec @@ -17,7 +17,6 @@ Name: udisks Version: 1.0.5 Release: 10%{?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 @@ -89,7 +88,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 From 1d97f9d34fb13bb150b05ed4972cfa13deb2bad6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:40:40 +0000 Subject: [PATCH 23/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 26199dc..9964cd8 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -174,6 +174,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 35b1f4879f35a4108ae1194a957d38e1a12100fa Mon Sep 17 00:00:00 2001 From: David King Date: Sat, 27 Apr 2019 08:30:16 +0100 Subject: [PATCH 24/48] Fix build failure (#1676172) --- udisks-1.0.5-fix-makedev-failure.patch | 77 ++++++++++++++++++++++++++ udisks.spec | 7 ++- 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 udisks-1.0.5-fix-makedev-failure.patch diff --git a/udisks-1.0.5-fix-makedev-failure.patch b/udisks-1.0.5-fix-makedev-failure.patch new file mode 100644 index 0000000..3b23f74 --- /dev/null +++ b/udisks-1.0.5-fix-makedev-failure.patch @@ -0,0 +1,77 @@ +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 9964cd8..11cb890 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -24,6 +24,7 @@ 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 BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} BuildRequires: pkgconfig(dbus-1) >= %{dbus_version} BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version} @@ -103,6 +104,7 @@ D-Bus interface definitions and documentation for udisks. %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 @@ -174,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 8c3fd4039cba4c18212d6372b1b0c41ee7b45e9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:20:16 +0000 Subject: [PATCH 25/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 11cb890..9eefd9c 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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) From cda131c717e67e21a6a822a5527bb89bdb622089 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:27:02 +0000 Subject: [PATCH 26/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 9eefd9c..c068f18 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 5d214083b1a6ff45092060fe3d19e6898cb102ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 20 Apr 2020 16:56:00 +0200 Subject: [PATCH 27/48] - rebuilt for sg3_utils 1.45 (#1809392) --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index c068f18..0693a4b 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 345a2e59c696061b57e179f94722fc35b0d4a574 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:10:38 +0000 Subject: [PATCH 28/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 0693a4b..bfb20ab 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -176,6 +176,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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) From dc6afbe0fbced6942222cf7fef56b2cbad3952f6 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:18:30 +0000 Subject: [PATCH 29/48] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- udisks.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/udisks.spec b/udisks.spec index bfb20ab..7595f0e 100644 --- a/udisks.spec +++ b/udisks.spec @@ -25,6 +25,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 +BuildRequires: make BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} BuildRequires: pkgconfig(dbus-1) >= %{dbus_version} BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version} From 341371d10037b310c745dfa7774941a72bfeae71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:34:17 +0000 Subject: [PATCH 30/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 7595f0e..4ae44c5 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 2f6d8b61e9f6a0337313345bd23895167b195b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:06 +0100 Subject: [PATCH 31/48] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- udisks.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 4ae44c5..8d733c4 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,10 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From b79be836f1be4fdddec29a63105e4438d097da7f Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 6 Apr 2021 18:01:40 +0200 Subject: [PATCH 32/48] - rebuilt for sg3_utils 1.46 --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 8d733c4..aa50c80 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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. From daec93730761dba6f1a37ade438992f0c695a51f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:55:44 +0000 Subject: [PATCH 33/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index aa50c80..2a289fe 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 3f8f59176d1fc2c46c29e138e9eb529291b7aba3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:24:41 +0000 Subject: [PATCH 34/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 2a289fe..77205b0 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From eccd7192ee7cc902ff0b4d33bfa4cb254557ea1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:16:21 +0000 Subject: [PATCH 35/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 77205b0..272ed83 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 36eb029508d0365b84ee6cc921c8fba772efcc23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:41:14 +0000 Subject: [PATCH 36/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 272ed83..2edaa52 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 66c6dffef18a08c02789d45c6abbe23ccf05df29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:59:56 +0000 Subject: [PATCH 37/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 2edaa52..9ff6dc5 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 52adc6c3c91ab2383b4b6b17107b4c47a0047d2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:59:26 +0000 Subject: [PATCH 38/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 9ff6dc5..e785b32 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 9f2737416db2510f47db84926cc793668a5eaac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 9 Feb 2024 19:17:05 +0100 Subject: [PATCH 39/48] - rebuilt for sg3_utils 1.48 --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index e785b32..ef7ed77 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 9ec3169e6163aa0c806cb62c1dd2270a2c46429d Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 40/48] Eliminate use of obsolete %patchN syntax (#2283636) --- udisks.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/udisks.spec b/udisks.spec index ef7ed77..9887e8f 100644 --- a/udisks.spec +++ b/udisks.spec @@ -102,10 +102,10 @@ 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 # https://bugzilla.redhat.com/show_bug.cgi?id=673544#c15 rm -f src/*-glue.h tools/*-glue.h From afaad5f5c1c0bd884bdea87d18f340c421ce75cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:08:30 +0000 Subject: [PATCH 41/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 9887e8f..45e3b4d 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -177,6 +177,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 40bcf6c53bf2f090a459439a7e2d384243d66281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:26:31 +0200 Subject: [PATCH 42/48] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- udisks.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/udisks.spec b/udisks.spec index 45e3b4d..e0b3eca 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,8 +15,9 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 27%{?dist} -License: GPLv2+ +Release: 28%{?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 @@ -177,6 +178,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 67e51962dc7a75bd60b1feb497193254818a2dd1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:37:17 +0000 Subject: [PATCH 43/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index e0b3eca..943555c 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 28%{?dist} +Release: 29%{?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 @@ -178,6 +178,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From ef535b8d0b3f9955529efb645ef5be4cefecf660 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:42:58 +0000 Subject: [PATCH 44/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 943555c..9666db4 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 29%{?dist} +Release: 30%{?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 @@ -178,6 +178,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From aa846f4aaa4e98698d472cef0a16c71a0aca8a1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:32:30 +0000 Subject: [PATCH 45/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index 9666db4..68352c2 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 30%{?dist} +Release: 31%{?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 @@ -178,6 +178,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 6af4eb71502d9a2ad7916d0fa97bf8224da88d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 21 Oct 2025 12:43:42 +0000 Subject: [PATCH 46/48] 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. --- sbindirinstall.diff | 13 +++++++++++++ udisks.spec | 13 ++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 sbindirinstall.diff 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 - 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 From a1ed702bc1342990c92c753ab38eb0032e8d64d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:06:39 +0000 Subject: [PATCH 47/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index d37c0bb..ceb8572 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 32%{?dist} +Release: 33%{?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 @@ -182,6 +182,9 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh \ %{_datadir}/gtk-doc %changelog +* 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 From 5e111e46bdaacf9c5dd885972af1a4e02098ac19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 20 Aug 2026 16:15:22 +0200 Subject: [PATCH 48/48] - rebuilt for sg3_utils 1.49 --- udisks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udisks.spec b/udisks.spec index ceb8572..6eeeddb 100644 --- a/udisks.spec +++ b/udisks.spec @@ -15,7 +15,7 @@ Summary: Storage Management Service Name: udisks Version: 1.0.5 -Release: 33%{?dist} +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 @@ -182,6 +182,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