From 5a1906f409098991b177995de1690b1c55d830ec Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Mon, 30 Apr 2012 14:40:40 -0400
Subject: [PATCH] Update to release 1.95.0

Signed-off-by: David Zeuthen <davidz@redhat.com>
---
 .gitignore   |  1 +
 sources      |  2 +-
 udisks2.spec | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3489aa2..36b8816 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /udisks-1.92.0.tar.bz2
 /udisks-1.93.0.tar.bz2
 /udisks-1.94.0.tar.bz2
+/udisks-1.95.0.tar.bz2
diff --git a/sources b/sources
index 126bee3..625b7f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c2a3428227de0251ff9e204d17dd2130  udisks-1.94.0.tar.bz2
+d7a6945f756f8a9aa3bbd37459b13636  udisks-1.95.0.tar.bz2
diff --git a/udisks2.spec b/udisks2.spec
index dcb36c6..9d5b4e3 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -7,7 +7,7 @@
 
 Summary: Disk Manager
 Name: udisks2
-Version: 1.94.0
+Version: 1.95.0
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -21,6 +21,8 @@ BuildRequires: libatasmart-devel >= %{libatasmart_version}
 BuildRequires: libgudev1-devel >= %{udev_version}
 BuildRequires: gtk-doc
 BuildRequires: systemd-devel
+BuildRequires: libacl-devel
+
 # needed to pull in the system bus daemon
 Requires: dbus >= %{dbus_version}
 # needed to pull in the udev daemon
@@ -37,16 +39,18 @@ Requires: xfsprogs
 Requires: dosfstools
 # for mlabel
 Requires: mtools
-# for mkntfs - no ntfsprogs on ppc, though
-%ifnarch ppc ppc64
-Requires: ntfsprogs
-%endif
 # for partitioning
 Requires: parted
 Requires: gdisk
 # for LUKS devices
 Requires: cryptsetup-luks
-Requires: acl
+
+# for mkntfs (not available on rhel or on ppc/ppc64)
+%if ! 0%{?rhel}
+%ifnarch ppc ppc64
+Requires: ntfsprogs
+%endif
+%endif
 
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
@@ -137,6 +141,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.95.0-1%{?dist}
+- Update to release 1.95.0
+
 * Tue Apr 10 2012 David Zeuthen <davidz@redhat.com> - 1.94.0-1%{?dist}
 - Update to release 1.94.0