From d9c3e8c36d1f391b4f70832955259d0a347d3489 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Wed, 9 May 2012 14:04:52 -0400
Subject: [PATCH] Update to release 1.97.0

---
 .gitignore                                    |  1 +
 sources                                       |  2 +-
 ...to-show-FS-on-CDs-USB-sticks-created.patch | 34 -------------------
 udisks2.spec                                  | 10 +++---
 4 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 udisks-1.97.0-Add-work-around-to-show-FS-on-CDs-USB-sticks-created.patch

diff --git a/.gitignore b/.gitignore
index ef25569..6cbcd40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /udisks-1.94.0.tar.bz2
 /udisks-1.95.0.tar.bz2
 /udisks-1.96.0.tar.bz2
+/udisks-1.97.0.tar.bz2
diff --git a/sources b/sources
index edb1dd5..56cc35a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-427a31f0d9056af79e44f0278844c8b9  udisks-1.96.0.tar.bz2
+8ae4ef908ab706789e0e2b33d8810877  udisks-1.97.0.tar.bz2
diff --git a/udisks-1.97.0-Add-work-around-to-show-FS-on-CDs-USB-sticks-created.patch b/udisks-1.97.0-Add-work-around-to-show-FS-on-CDs-USB-sticks-created.patch
deleted file mode 100644
index edb10b8..0000000
--- a/udisks-1.97.0-Add-work-around-to-show-FS-on-CDs-USB-sticks-created.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6512ec74025a0fec96a58ab330d891e3004b5826 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Thu, 3 May 2012 09:46:43 -0400
-Subject: [PATCH] Add work-around to show FS on CDs/USB sticks created using
- isohybrid
-
-This happens at least in two cases - when using loop-devices with
-LO_PARTSCAN and when dd(1)'ing the image to a USB stick.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
- data/80-udisks2.rules |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules
-index f1fe9bc..f6a3e47 100644
---- a/data/80-udisks2.rules
-+++ b/data/80-udisks2.rules
-@@ -96,3 +96,12 @@ ENV{ID_FS_TYPE}=="ntfs|vfat", \
- 
- # read-only non-Linux software installer partitions
- ENV{ID_VENDOR}=="Sony", ENV{ID_MODEL}=="PRS*Launcher", ENV{UDISKS_IGNORE}="1"
-+
-+# Content created using isohybrid (typically used on CDs and USB
-+# sticks for bootable media) is a bit special insofar that the
-+# interesting content is on a DOS partition with type 0x00 ... which
-+# is hidden above. So undo this.
-+#
-+# See http://mjg59.dreamwidth.org/11285.html for more details
-+#
-+ENV{ID_PART_TABLE_TYPE}=="dos", ENV{ID_PART_ENTRY_TYPE}=="0x0", ENV{ID_FS_TYPE}=="iso9660", ENV{UDISKS_IGNORE}="0"
--- 
-1.7.10
-
diff --git a/udisks2.spec b/udisks2.spec
index 2b77616..c9b0a91 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -7,8 +7,8 @@
 
 Summary: Disk Manager
 Name: udisks2
-Version: 1.96.0
-Release: 2%{?dist}
+Version: 1.97.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/udisks
@@ -55,8 +55,6 @@ Requires: ntfsprogs
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
-Patch0: udisks-1.97.0-Add-work-around-to-show-FS-on-CDs-USB-sticks-created.patch
-
 %description
 udisks provides a daemon, D-Bus API and command line tools for
 managing disks and storage devices. This package is for the udisks 2.x
@@ -86,7 +84,6 @@ daemon. This package is for the udisks 2.x series.
 
 %prep
 %setup -q -n udisks-%{version}
-%patch0 -p1
 
 %build
 %configure --enable-gtk-doc
@@ -144,6 +141,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Wed May 09 2012 David Zeuthen <davidz@redhat.com> - 1.97.0-1%{?dist}
+- Update to release 1.97.0
+
 * Thu May 03 2012 David Zeuthen <davidz@redhat.com> - 1.96.0-2%{?dist}
 - Include patch so Fedora Live media is shown