--- udisks2.spec.orig	2011-11-28 10:46:22.945256364 -0500
+++ udisks2.spec	2011-11-28 10:38:33.162755637 -0500
@@ -1,17 +1,20 @@
-%define glib2_version           2.31.0
-%define polkit_version          0.101
-%define udev_version            173
-%define libatasmart_version     0.12
+%define glib2_version                   2.31.0
+%define gobject_introspection_version   1.30.0
+%define polkit_version                  0.101
+%define udev_version                    173
+%define libatasmart_version             0.12
+%define dbus_version                    1.4.0
 
 Summary: Disk Manager
 Name: udisks2
 Version: 1.90.0
-Release: 0.git20111122%{?dist}
+Release: 0.git20111128%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/udisks
-Source0: http://people.freedesktop.org/~david/udisks-1.90.0.git20111122.tar.bz2
+Source0: http://people.freedesktop.org/~david/udisks-1.90.0.git20111128.tar.bz2
 BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
 BuildRequires: polkit-devel >= %{polkit_version}
 BuildRequires: intltool
 BuildRequires: libatasmart-devel >= %{libatasmart_version}
@@ -40,13 +43,16 @@
 # for partitioning
 Requires: parted
 Requires: gdisk
+# for LUKS devices
+Requires: cryptsetup-luks
 
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
 %description
 udisks provides a daemon, D-Bus API and command line tools for
-managing disks and storage devices.
+managing disks and storage devices. This package is for the udisks 2.x
+series.
 
 %package -n libudisks2
 Summary: Dynamic library to access the udisks daemon
@@ -55,7 +61,8 @@
 
 %description -n libudisks2
 This package contains the dynamic library libudisks2, which provides
-access to the udisks daemon.
+access to the udisks daemon. This package is for the udisks 2.x
+series.
 
 %package -n libudisks2-devel
 Summary: Development files for libudev
@@ -65,8 +72,9 @@
 License: LGPLv2+
 
 %description -n libudisks2-devel
-This package contains the development files for the library libudisks2, a
-dynamic library, which provides access to the udisks daemon
+This package contains the development files for the library
+libudisks2, a dynamic library, which provides access to the udisks
+daemon. This package is for the udisks 2.x series.
 
 %prep
 %setup -q -n udisks-%{version}
@@ -86,14 +94,14 @@
 %postun -n libudisks2 -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-
 %doc README AUTHORS NEWS COPYING HACKING
 
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
-%{_sysconfdir}/profile.d/udisksctl-bash-completion.sh
+%{_sysconfdir}/bash_completion.d/udisksctl-bash-completion.sh
 /lib/udev/rules.d/80-udisks2.rules
 /sbin/umount.udisks2
+
+%dir /lib/udisks2
 /lib/udisks2/udisksd
 
 %{_bindir}/udisksctl
@@ -104,15 +112,15 @@
 %{_datadir}/polkit-1/actions/org.freedesktop.udisks2.policy
 %{_datadir}/dbus-1/system-services/org.freedesktop.UDisks2.service
 
+# Permissions for local state data are 0700 to avoid leaking information
+# about e.g. mounts to unprivileged users
 %attr(0700,root,root) %dir %{_localstatedir}/lib/udisks2
 
 %files -n libudisks2
-%defattr(-,root,root,-)
 %{_libdir}/libudisks2.so.*
 %{_libdir}/girepository-1.0/UDisks-2.0.typelib
 
 %files -n libudisks2-devel
-%defattr(-,root,root,-)
 %{_libdir}/libudisks2.so
 %dir %{_includedir}/udisks2
 %dir %{_includedir}/udisks2/udisks
@@ -124,5 +132,8 @@
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Mon Nov 28 2011 David Zeuthen <davidz@redhat.com> - 1.90.0-0.git20111128%{?dist}
+- Updated for review comments (#756046)
+
 * Mon Nov 22 2011 David Zeuthen <davidz@redhat.com> - 1.90.0-0.git20111122%{?dist}
 - Initial packaging of udisks2