diff --git a/.gitignore b/.gitignore index 6cbcd40..4e31498 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /udisks-1.95.0.tar.bz2 /udisks-1.96.0.tar.bz2 /udisks-1.97.0.tar.bz2 +/udisks-1.98.0.tar.bz2 diff --git a/sources b/sources index 56cc35a..920ee63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ae4ef908ab706789e0e2b33d8810877 udisks-1.97.0.tar.bz2 +51346a6cf9183bb7bf5771b7166dfac1 udisks-1.98.0.tar.bz2 diff --git a/udisks2-root-bound-mount-fix.patch b/udisks2-root-bound-mount-fix.patch deleted file mode 100644 index 53d711b..0000000 --- a/udisks2-root-bound-mount-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e0b8ffe3099735fefd64973e6575c67ac0759be2 Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Tue, 15 May 2012 14:17:22 +0000 -Subject: Bug 49842 – Unhandled rootfs on bind mount - -Don't ignore a mount just because if a subtree of the filesystem is -mounted. Because if we do this, we may wrongly conclude the device is -not mounted at all, which then means that it's visible in the desktop -UI and subject to automounting. - -In the future, we may want a "a(ss) MountPointsFull" property that in -addition to the mount point also contains the subtree that is mounted -at said mountpoint. - -https://bugs.freedesktop.org/show_bug.cgi?id=49842 - -Signed-off-by: David Zeuthen ---- -diff --git a/src/udisksmountmonitor.c b/src/udisksmountmonitor.c -index 43adaa5..36e1476 100644 ---- a/src/udisksmountmonitor.c -+++ b/src/udisksmountmonitor.c -@@ -433,10 +433,6 @@ udisks_mount_monitor_get_mountinfo (UDisksMountMonitor *monitor, - continue; - } - -- /* ignore mounts where only a subtree of a filesystem is mounted */ -- if (g_strcmp0 (encoded_root, "/") != 0) -- continue; -- - /* Temporary work-around for btrfs, see - * - * https://bugzilla.redhat.com/show_bug.cgi?id=495152#c31 --- -cgit v0.9.0.2-2-gbebe diff --git a/udisks2.spec b/udisks2.spec index ec4fc7e..8173efa 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -7,14 +7,12 @@ Summary: Disk Manager Name: udisks2 -Version: 1.97.0 -Release: 4%{?dist} +Version: 1.98.0 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks Source0: http://udisks.freedesktop.org/releases/udisks-%{version}.tar.bz2 -# https://bugs.freedesktop.org/show_bug.cgi?id=49842 -Patch0: udisks2-root-bound-mount-fix.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version} @@ -89,7 +87,6 @@ daemon. This package is for the udisks 2.x series. %prep %setup -q -n udisks-%{version} -%patch0 -p1 -b .root-bound-mount-fix %build %configure --enable-gtk-doc @@ -147,6 +144,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Thu Jun 07 2012 David Zeuthen - 1.98.0-1%{?dist} +- Update to release 1.98.0 + * Mon Jun 04 2012 Kay Sievers - 1.97.0-4 - rebuild for libudev1