From eccb497a120c9f2c820daf92267e657577067aab Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@fedoraproject.org>
Date: Sun, 12 Apr 2009 20:10:09 +0000
Subject: [PATCH] - New snapshot

---
 .cvsignore                                    |  1 +
 ...-the-D-Bus-error-name-to-the-error-s.patch | 41 -------------------
 gnome-disk-utility.spec                       | 19 ++++++---
 sources                                       |  2 +-
 4 files changed, 16 insertions(+), 47 deletions(-)
 delete mode 100644 0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch

diff --git a/.cvsignore b/.cvsignore
index 1ad7a5a..68139eb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 gnome-disk-utility-0.1.git20080720.tar.bz2
 gnome-disk-utility-0.2.tar.bz2
 gnome-disk-utility-0.3.20090406git.tar.bz2
+gnome-disk-utility-0.3.20090412git.tar.bz2
diff --git a/0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch b/0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch
deleted file mode 100644
index 8d0facf..0000000
--- a/0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 53cf4a6635586e68c7a45030b381bc98d4f9eb1c Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Wed, 8 Apr 2009 12:04:17 -0400
-Subject: [PATCH] for now, prepend the D-Bus error name to the error string from the daemon
-
-This is hidden behind a GtkExpander so it's not exactly a big deal. As
-noted we can removed this once we port to PolicyKit 1.0.
----
- src/gdu/gdu-error.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/src/gdu/gdu-error.c b/src/gdu/gdu-error.c
-index 956c61c..992c4d8 100644
---- a/src/gdu/gdu-error.c
-+++ b/src/gdu/gdu-error.c
-@@ -57,6 +57,7 @@ _gdu_error_fixup (GError *error)
- {
-         const char *name;
-         gboolean matched;
-+        gchar *s;
- 
-         if (error == NULL)
-                 return;
-@@ -89,6 +90,14 @@ _gdu_error_fixup (GError *error)
- 
-         if (matched)
-                 error->domain = GDU_ERROR;
-+
-+        /* Always prepend the D-Bus exception name to the message; we need this in
-+         * gdu_error_check_polkit_not_authorized() to determine if it's a PolicyKit
-+         * exception... when we port to polkit 1.0 this can go away.
-+         */
-+        s = g_strdup_printf ("%s: %s", name, error->message);
-+        g_free (error->message);
-+        error->message = s;
- }
- 
- /**
--- 
-1.6.2.2
-
diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec
index fb663f9..4f31bc6 100644
--- a/gnome-disk-utility.spec
+++ b/gnome-disk-utility.spec
@@ -12,11 +12,11 @@
 Summary: Disk management application
 Name: gnome-disk-utility
 Version: 0.3
-Release: 0.3.20090406git%{?dist}
+Release: 0.4.20090412git%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
-Source0: %{name}-%{version}.20090406git.tar.bz2
+Source0: %{name}-%{version}.20090412git.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -35,8 +35,7 @@ BuildRequires: libsexy-devel
 BuildRequires: intltool
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
-
-Patch0: 0001-for-now-prepend-the-D-Bus-error-name-to-the-error-s.patch
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
 This package contains the Palimpsest disk management application.
@@ -58,6 +57,7 @@ contain UI-related code.
 %package ui-libs
 Summary: Shared libraries used by Palimpsest
 Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -91,7 +91,6 @@ develop applications with gnome-disk-utility-ui-libs.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gdu-polkit-authz
 
 %build
 %configure
@@ -109,6 +108,10 @@ desktop-file-install --delete-original  \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/palimpsest.desktop
 
+desktop-file-install --delete-original  \
+  --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \
+  $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop
+
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
@@ -147,6 +150,9 @@ fi
 %files
 %defattr(-,root,root,-)
 
+%{_libexecdir}/gdu-notification-daemon
+%{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop
+
 %{_bindir}/palimpsest
 %{_datadir}/applications/palimpsest.desktop
 
@@ -200,6 +206,9 @@ fi
 %{_includedir}/gnome-disk-utility/gdu-gtk/*
 
 %changelog
+* Sun Apr 12 2009 David Zeuthen <davidz@redhat.com> - 0.3-0.4.20090412git%{?dist}
+- New snapshot
+
 * Fri Apr 10 2009 Matthias Clasen <mclasen@redhat.com> - 0.3-0.3.20090406git%{?dist}
 - Don't own directories that belong to hicolor-icon-theme
 
diff --git a/sources b/sources
index c23ec14..86926a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d1c0065390398bf599e23a2c6386352  gnome-disk-utility-0.3.20090406git.tar.bz2
+409fa6bb700fa9fab6e7de88dacd4b46  gnome-disk-utility-0.3.20090412git.tar.bz2