Fix header bar button positions

gnome-disk-utility-3.12.1-fix-header-bar-item-positions.patch

@@ -0,0 +1,66 @@
+From cdbb0497d9536d81b24abe166ab7c7834fd18e8f Mon Sep 17 00:00:00 2001
+From: Yosef Or Boczko <yoseforb@src.gnome.org>
+Date: Thu, 1 May 2014 19:46:20 +0200
+Subject: Fix headerbar item positions
+
+https://bugzilla.gnome.org/show_bug.cgi?id=729349
+
+Signed-off-by: David Zeuthen <zeuthen@gmail.com>
+
+diff --git a/configure.ac b/configure.ac
+index ebdd5b0..6ecfbe3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,7 +104,7 @@ AC_MSG_RESULT([no])])
+ 
+ GLIB2_REQUIRED=2.31.0
+ UDISKS2_REQUIRED=2.1.1
+-GTK3_REQUIRED=3.10.0
++GTK3_REQUIRED=3.12.0
+ LIBSECRET1_REQUIRED=0.7
+ PWQUALITY_REQUIRED=1.0.0
+ CANBERRA_REQUIRED=0.1
+diff --git a/src/disks/gduwindow.c b/src/disks/gduwindow.c
+index 24834ce..f8710d6 100644
+--- a/src/disks/gduwindow.c
++++ b/src/disks/gduwindow.c
+@@ -978,26 +978,27 @@ create_header (GduWindow *window)
+   header = gtk_header_bar_new ();
+   gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
+ 
+-  button = window->devtab_drive_loop_detach_button = gtk_button_new ();
+-  image = gtk_image_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_MENU);
++  button = window->devtab_drive_generic_button = gtk_menu_button_new ();
++  gtk_menu_button_set_popup (GTK_MENU_BUTTON (button), window->generic_drive_menu);
++  image = gtk_image_new_from_icon_name ("emblem-system-symbolic", GTK_ICON_SIZE_MENU);
+   gtk_button_set_image (GTK_BUTTON (button), image);
+   gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
+ 
+-  button = window->devtab_drive_eject_button = gtk_button_new ();
+-  image = gtk_image_new_from_icon_name ("media-eject-symbolic", GTK_ICON_SIZE_MENU);
++  button = window->devtab_drive_power_off_button = gtk_button_new ();
++  image = gtk_image_new_from_icon_name ("system-shutdown-symbolic", GTK_ICON_SIZE_MENU);
+   gtk_button_set_image (GTK_BUTTON (button), image);
+   gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
+ 
+-  button = window->devtab_drive_power_off_button = gtk_button_new ();
+-  image = gtk_image_new_from_icon_name ("system-shutdown-symbolic", GTK_ICON_SIZE_MENU);
++  button = window->devtab_drive_eject_button = gtk_button_new ();
++  image = gtk_image_new_from_icon_name ("media-eject-symbolic", GTK_ICON_SIZE_MENU);
+   gtk_button_set_image (GTK_BUTTON (button), image);
+   gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
+ 
+-  button = window->devtab_drive_generic_button = gtk_menu_button_new ();
+-  gtk_menu_button_set_popup (GTK_MENU_BUTTON (button), window->generic_drive_menu);
+-  image = gtk_image_new_from_icon_name ("emblem-system-symbolic", GTK_ICON_SIZE_MENU);
++  button = window->devtab_drive_loop_detach_button = gtk_button_new ();
++  image = gtk_image_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_MENU);
+   gtk_button_set_image (GTK_BUTTON (button), image);
+   gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
++
+   return header;
+ }
+ 
+-- 
+cgit v0.10.1
+

gnome-disk-utility.spec

@@ -1,16 +1,19 @@
 # Only enable if using patches that touches configure.ac,
 # Makefile.am or other build system related files
 #
-%define enable_autoreconf 0
+%define enable_autoreconf 1
 
-Summary: Disks
+Name:          gnome-disk-utility
-Name: gnome-disk-utility
+Version:       3.12.1
-Version: 3.12.1
+Release:       6%{?dist}
-Release: 5%{?dist}
+Summary:       Disks
-License: GPLv2+
+
-Group: System Environment/Libraries
+Group:         Applications/System
-URL: https://git.gnome.org/browse/gnome-disk-utility
+License:       GPLv2+
-Source0: https://download.gnome.org/sources/gnome-disk-utility/3.12/%{name}-%{version}.tar.xz
+URL:           https://git.gnome.org/browse/gnome-disk-utility
+Source0:       https://download.gnome.org/sources/%{name}/3.12/%{name}-%{version}.tar.xz
+# https://bugzilla.gnome.org/show_bug.cgi?id=729349
+Patch0:        gnome-disk-utility-3.12.1-fix-header-bar-item-positions.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: docbook-style-xsl
@@ -31,15 +34,15 @@ BuildRequires: pkgconfig(libsystemd-login)
 BuildRequires: pkgconfig(pwquality)
 BuildRequires: pkgconfig(udisks2)
 
-Requires: udisks2
+Requires:      udisks2
 
-Obsoletes: gnome-disk-utility-format
+Obsoletes:     gnome-disk-utility-format
-Obsoletes: nautilus-gdu
+Obsoletes:     nautilus-gdu
-Obsoletes: gnome-disk-utility-libs
+Obsoletes:     gnome-disk-utility-libs
-Obsoletes: gnome-disk-utility-devel
+Obsoletes:     gnome-disk-utility-devel
-Obsoletes: gnome-disk-utility-ui-libs
+Obsoletes:     gnome-disk-utility-ui-libs
-Obsoletes: gnome-disk-utility-ui-devel
+Obsoletes:     gnome-disk-utility-ui-devel
-Obsoletes: gnome-disk-utility-nautilus
+Obsoletes:     gnome-disk-utility-nautilus
 
 %if 0%{?enable_autoreconf}
 BuildRequires: autoconf
@@ -54,24 +57,28 @@ fstab/crypttab editing, ATA SMART and other features
 
 %prep
 %setup -q
+%patch0 -p1
+
 
 %build
 %if 0%{?enable_autoreconf}
-autoreconf
+autoreconf --force --install
 %endif
 %configure
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
+
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} INSTALL="install -p" install
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/*.a
-
 %find_lang %{name}
 
+rm -f %{buildroot}%{_libdir}/gnome-settings-daemon-3.0/*.la
+rm -f %{buildroot}%{_libdir}/gnome-settings-daemon-3.0/*.a
+
+
 %check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+
 
 %post
 for d in hicolor HighContrast ; do
@@ -79,6 +86,7 @@ for d in hicolor HighContrast ; do
 done
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 
+
 %postun
 update-desktop-database %{_datadir}/applications &> /dev/null || :
 if [ $1 -eq 0 ] ; then
@@ -89,6 +97,7 @@ if [ $1 -eq 0 ] ; then
     done
 fi
 
+
 %posttrans
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 for d in hicolor HighContrast ; do
@@ -97,6 +106,7 @@ done
 
 
 %files -f %{name}.lang
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/gnome-disks
 %{_bindir}/gnome-disk-image-mounter
 %{_datadir}/applications/gnome-disks.desktop
@@ -104,19 +114,18 @@ done
 %{_datadir}/applications/gnome-disk-image-writer.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.Disks.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gdu-sd.gschema.xml
-
 %{_datadir}/icons/hicolor/*/apps/gnome-disks*
 %{_datadir}/icons/HighContrast/*/apps/gnome-disks.png
-
-%{_mandir}/man1/*
-
 %{_libdir}/gnome-settings-daemon-3.0/gdu-sd-plugin.gnome-settings-plugin
 %{_libdir}/gnome-settings-daemon-3.0/libgdu-sd.so
-
+%{_mandir}/man1/*
-%doc README AUTHORS NEWS COPYING
 
 
 %changelog
+* Thu Sep 11 2014 David King <amigadave@amigadave.com> - 3.12.1-6
+- Fix header bar button positions
+- Preserve timestamps during installation
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild