[gnome-disk-utility] Update to release 3.3.90

Fri Jan 20 22:33:38 UTC 2012

commit d4701e4298c4d96197eb1a844d062efcc8742a19
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Jan 20 17:28:44 2012 -0500

    Update to release 3.3.90

 .gitignore                                      |    1 +
 gdu-nautilus.patch                              |   12 -
 gnome-disk-utility-2.29.1-missing-include.patch |   24 --
 gnome-disk-utility.spec                         |  193 ++------------
 no-statusicon.patch                             |  327 -----------------------
 no-xkb.patch                                    |   46 ----
 sources                                         |    2 +-
 7 files changed, 29 insertions(+), 576 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index ee5e035..14207d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ gnome-disk-utility-2.30.1.tar.bz2
 /gnome-disk-utility-2.91.7.tar.bz2
 /gnome-disk-utility-3.0.0.tar.bz2
 /gnome-disk-utility-3.0.2.tar.bz2
+/gnome-disk-utility-3.3.90.tar.xz
diff --git a/gnome-disk-utility.spec b/gnome-disk-utility.spec
index 807c4c0..421870d 100644
--- a/gnome-disk-utility.spec
+++ b/gnome-disk-utility.spec
@@ -1,113 +1,39 @@
-%define dbus_version              1.2
-%define dbus_glib_version         0.76
-%define glib2_version             2.16
-%define gtk3_version              2.99
-%define gnome_doc_utils_version   0.3.2
-%define gnome_keyring_version     2.22
-%define udisks_version            1.0.3
-%define unique_version            1.0.4
-%define libnotify_version         0.7.0
-%define nautilus_version          2.26
-%define libatasmart_version       0.14
-
-Summary: Disk management application
+%define glib2_version             2.31.0
+%define gtk3_version              3.3.0
+%define udisks_version            1.90.0
+
+Summary: Disks
 Name: gnome-disk-utility
-Version: 3.0.2
-Release: 5%{?dist}
+Version: 3.3.90
+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/3.0/%{name}-%{version}.tar.bz2
+URL: http://git.gnome.org/browse/gnome-disk-utility
+Source0: http://download.gnome.org/sources/gnome-disk-utility/3.3/%{name}-%{version}.tar.xz
 
-BuildRequires: dbus-devel  >= %{dbus_version}
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: dbus-glib >= %{dbus_glib_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
-BuildRequires: gnome-keyring-devel >= %{gnome_keyring_version}
-BuildRequires: udisks-devel >= %{udisks_version}
-BuildRequires: unique3-devel >= %{unique_version}
-BuildRequires: libnotify-devel >= %{libnotify_version}
-BuildRequires: nautilus-devel >= %{nautilus_version}
-BuildRequires: libatasmart-devel >= %{libatasmart_version}
-BuildRequires: avahi-ui-devel
-BuildRequires: intltool
-BuildRequires: rarian-compat
-BuildRequires: automake autoconf libtool
+BuildRequires: libudisks2-devel >= %{udisks_version}
 BuildRequires: gnome-common
-BuildRequires: gtk-doc
 
-Requires: %{name}-libs = %{version}-%{release}
 Obsoletes: gnome-disk-utility-format
 Obsoletes: nautilus-gdu
+Obsoletes: gnome-disk-utility-libs
+Obsoletes: gnome-disk-utility-devel
+Obsoletes: gnome-disk-utility-ui-libs
+Obsoletes: gnome-disk-utility-ui-devel
+Obsoletes: gnome-disk-utility-nautilus
 
 %description
-This package contains the Palimpsest disk management application.
-Palimpsest supports partitioning, file system creation, encryption,
-RAID, SMART monitoring, etc.
-
-%package libs
-Summary: Shared libraries used by Palimpsest
-Group: Development/Libraries
-Requires: udisks >= %{udisks_version}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description libs
-This package contains libraries that are used by the Palimpsest
-disk management application. The libraries in this package do not
-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
-
-%description ui-libs
-This package contains libraries that are used by the Palimpsest
-disk management application. The libraries in this package contain
-disk-related widgets for use in GTK+ applications.
-
-%package devel
-Summary: Development files for gnome-disk-utility-libs
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-This package contains header files and libraries needed to
-develop applications with gnome-disk-utility-libs.
-
-%package ui-devel
-Summary: Development files for gnome-disk-utility-ui-libs
-Group: Development/Libraries
-Requires: %{name}-ui-libs = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
-
-%description ui-devel
-This package contains header files and libraries needed to
-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
-This package contains a Nautilus extension providing formatting
-functionality.
+This package contains the Disks application.  Disks supports
+partitioning, file system creation, encryption, fstab/crypttab
+editing, ATA SMART and other features
 
 %prep
 %setup -q
 
-aclocal
-automake
-
 %build
 %configure
 make %{?_smp_mflags}
@@ -115,107 +41,42 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# TODO: upstream doesn't ship a HACKING file yet
-echo " " > HACKING
-
 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
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.a
-
-
 %find_lang %{name}
 
 %post
+touch --no-create %{_datadir}/icons/hicolor || :
 update-desktop-database %{_datadir}/applications &> /dev/null
 
 %postun
 update-desktop-database %{_datadir}/applications &> /dev/null
-
-%post libs
-touch --no-create %{_datadir}/icons/hicolor || :
-/sbin/ldconfig
-
-%postun libs
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
-/sbin/ldconfig
 
-%posttrans libs
+%posttrans
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor || :
 
-%post ui-libs -p /sbin/ldconfig
 
-%postun ui-libs -p /sbin/ldconfig
-
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 
-%{_libexecdir}/gdu-notification-daemon
-%{_sysconfdir}/xdg/autostart/gdu-notification-daemon.desktop
-%{_libexecdir}/gdu-format-tool
-
 %{_bindir}/palimpsest
 %{_datadir}/applications/palimpsest.desktop
 
-%dir %{_datadir}/gnome/help/palimpsest
-%{_datadir}/gnome/help/palimpsest/*
-
-%dir %{_datadir}/omf/palimpsest
-%{_datadir}/omf/palimpsest/*
-
-%files libs -f %{name}.lang
-%defattr(-,root,root,-)
-
-%doc README AUTHORS NEWS COPYING HACKING TODO
+%{_datadir}/gnome-disk-utility/*.ui
+%{_datadir}/icons/hicolor/*
 
-%{_libdir}/libgdu.so.*
-
-# Yes, it's a bit weird to include icons in the non-UI package but the
-# library returns references to these icons
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/icons/hicolor/scalable/apps/*.svg
-
-%files ui-libs
-%defattr(-,root,root,-)
-
-%{_libdir}/libgdu-gtk.so.*
-
-%files devel
-%defattr(-,root,root,-)
-
-%{_libdir}/libgdu.so
-%{_libdir}/pkgconfig/gdu.pc
-
-%dir %{_includedir}/gnome-disk-utility
-%dir %{_includedir}/gnome-disk-utility/gdu
-%{_includedir}/gnome-disk-utility/gdu/*
-
-%files ui-devel
-%defattr(-,root,root,-)
-
-%{_libdir}/libgdu-gtk.so
-%{_libdir}/pkgconfig/gdu-gtk.pc
-
-%dir %{_includedir}/gnome-disk-utility/gdu-gtk
-%{_includedir}/gnome-disk-utility/gdu-gtk/*
-
-%files nautilus
-%defattr(-,root,root,-)
-
-%{_libdir}/nautilus/extensions-3.0/*.so
+%doc README AUTHORS NEWS COPYING
 
 %changelog
+* Fri Jan 20 2012 David Zeuthen <davidz at redhat.com> - 3.3.90-1%{?dist}
+- Update to release 3.3.90
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 3d554b5..726d0dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a4b9c005677a62a519b8197e6bba02f  gnome-disk-utility-3.0.2.tar.bz2
+b8a0a15d9cd40f9b05fc0e801d70be89  gnome-disk-utility-3.3.90.tar.xz
