Merge branch 'f15'

Conflicts:
	gnome-disk-utility.spec

.gitignore

@@ -2,3 +2,5 @@ gnome-disk-utility-2.30.1.tar.bz2
 /gnome-disk-utility-2.32.0.tar.bz2
 /gnome-disk-utility-2.32.1.tar.bz2
 /gnome-disk-utility-2.91.6.tar.bz2
+/gnome-disk-utility-2.91.7.tar.bz2
+/gnome-disk-utility-3.0.0.tar.bz2

gnome-disk-utility.spec

@@ -12,13 +12,12 @@
 
 Summary: Disk management application
 Name: gnome-disk-utility
-Version: 2.91.6
+Version: 3.0.0
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://git.gnome.org/cgit/gnome-disk-utility
-Source0: http://download.gnome.org/sources/gnome-disk-utility/2.91/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-disk-utility/3.0/%{name}-%{version}.tar.bz2
-Patch0: gdu-nautilus.patch
 
 BuildRequires: dbus-devel  >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -94,6 +93,7 @@ develop applications with gnome-disk-utility-ui-libs.
 %package nautilus
 Summary: Nautilus extension
 Group: Applications/File
+Obsoletes: %{name} < 2.91.6-5
 Requires: %{name} = %{version}-%{release}
 
 %description nautilus
@@ -102,7 +102,6 @@ functionality.
 
 %prep
 %setup -q
-%patch0 -p1 -b .nautilus
 
 aclocal
 automake
@@ -213,6 +212,15 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
 %{_libdir}/nautilus/extensions-3.0/*.so
 
 %changelog
+* Mon Apr  4 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.0-1
+- Update to 3.0.0
+
+* Mon Mar 21 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.7-1
+- Update to 2.91.7
+
+* Mon Mar 14 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.6-5
+- Fix gnome-disk-utility-nautilus upgrade path
+
 * Tue Feb 22 2011 Tomas Bzatek <tbzatek@redhat.com> - 2.91.6-4
 - Split nautilus extension into a separate package
 

sources

@@ -1 +1 @@
-8d902c78f5f8a245dc97029d53fa12a4  gnome-disk-utility-2.91.6.tar.bz2
+567a57df8555f5bbee3b664f40684518  gnome-disk-utility-3.0.0.tar.bz2