[udisks] Update 1.0.4

[David Zeuthen]

commit 9da39b7e7bc04ff99e160a98c43f2f7e7636afdd
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Aug 26 11:57:36 2011 -0400

    Update 1.0.4
    
    Signed-off-by: David Zeuthen <davidz at redhat.com>

 .gitignore  |    1 +
 sources     |    2 +-
 udisks.spec |   27 ++++++++-------------------
 3 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 29a21a0..9212a1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ udisks-1.0.0.tar.gz
 udisks-1.0.1.tar.gz
 /udisks-1.0.2.tar.gz
 /udisks-1.0.3.tar.gz
+/udisks-1.0.4.tar.gz
diff --git a/sources b/sources
index a54bcb8..9406fae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ad30772152c755df95cbb6fc91ad0cf  udisks-1.0.3.tar.gz
+86c63b2b5484f2060499a052b5b6256b  udisks-1.0.4.tar.gz
diff --git a/udisks.spec b/udisks.spec
index 95bde7e..ba966da 100644
--- a/udisks.spec
+++ b/udisks.spec
@@ -9,12 +9,11 @@
 %define libatasmart_version     0.12
 %define sg3_utils_version       1.27
 %define smp_utils_version       0.94
-%define lvm2_version            2.02.65
 
 Summary: Storage Management Service
 Name: udisks
-Version: 1.0.3
-Release: 3%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/udisks
@@ -30,7 +29,6 @@ BuildRequires: libatasmart-devel >= %{libatasmart_version}
 BuildRequires: libgudev1-devel >= %{udev_version}
 BuildRequires: libudev-devel >= %{udev_version}
 BuildRequires: sg3_utils-devel >= %{sg3_utils_version}
-BuildRequires: lvm2-devel >= %{lvm2_version}
 BuildRequires: gtk-doc
 # needed to pull in the system bus daemon
 Requires: dbus >= %{dbus_version}
@@ -59,12 +57,6 @@ Requires: ntfsprogs
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
-# we need liblvm2app at least this recent since the ABI changed (sizes
-# reported in number of bytes instead of number of sectors) without
-# the sonumber changing
-#
-Requires: lvm2-libs >= %{lvm2_version}
-
 # Obsolete and Provide DeviceKit-disks - udisks provides exactly the same
 # ABI just with a different name and versioning-scheme
 #
@@ -112,13 +104,6 @@ ln -s udisks.1 $RPM_BUILD_ROOT%{_datadir}/man/man1/devkit-disks.1
 # TODO: should be fixed upstream
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/udisks-bash-completion.sh
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=733161
-rmdir $RPM_BUILD_ROOT%{_localstatedir}/run/udisks
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/udisks.conf << EOF
-d /var/run/udisks 0700 root root
-EOF
-
 %find_lang %{name}
 
 %files -f %{name}.lang
@@ -135,7 +120,6 @@ EOF
 /lib/udev/udisks-dm-export
 /lib/udev/udisks-probe-ata-smart
 /lib/udev/udisks-probe-sas-expander
-/lib/udev/udisks-lvm-pv-export
 /sbin/umount.udisks
 
 %{_bindir}/*
@@ -149,7 +133,6 @@ EOF
 
 %{_datadir}/dbus-1/system-services/*.service
 
-%{_sysconfdir}/tmpfiles.d/udisks.conf
 %attr(0700,root,root) %dir %{_localstatedir}/lib/udisks
 
 %files devel
@@ -161,6 +144,12 @@ EOF
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Fri Aug 26 2011 David Zeuthen <davidz at redhat.com> - 1.0.4-1%{?dist}
+- Update to release 1.0.4 and update BR + files to reflect that lvm2 is no
+  longer enabled given recommendations from upstream (lvm2 support in
+  udisks never worked well and caused a lot more problems than it solved)
+- Remove /etc/tmpfiles.d/udisks.conf hack since this is now created on demand
+
 * Thu Aug 25 2011 David Zeuthen <davidz at redhat.com> - 1.0.3-3%{?dist}
 - Use tmpfiles.d for /var/run dir (#733161)