From 822a0727487f7a0b69957c76a2bc8404ea3e3e4b Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Thu, 24 Jul 2008 23:10:52 +0000 Subject: [PATCH] - New upstream version --- .cvsignore | 2 +- gparted-refresh_crash-fix.patch | 52 --------------------------------- gparted.spec | 9 +++--- run-gparted | 2 -- sources | 2 +- 5 files changed, 7 insertions(+), 60 deletions(-) delete mode 100644 gparted-refresh_crash-fix.patch delete mode 100644 run-gparted diff --git a/.cvsignore b/.cvsignore index 315cb28..bf1ac44 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gparted-0.3.7.tar.bz2 +gparted-0.3.8.tar.bz2 diff --git a/gparted-refresh_crash-fix.patch b/gparted-refresh_crash-fix.patch deleted file mode 100644 index 6dcd617..0000000 --- a/gparted-refresh_crash-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- include/Win_GParted.h 2008-04-29 10:17:27.000000000 -0400 -+++ include/Win_GParted.h.new 2008-04-30 09:43:49.000000000 -0400 -@@ -238,6 +238,7 @@ - unsigned short new_count;//new_count keeps track of the new created partitions - FS fs ; - bool OPERATIONSLIST_OPEN ; -+ sigc::connection combo_devices_signal_changed_id ; - - GParted_Core gparted_core ; - std::vector device_info ; ---- src/Win_GParted.cc 2008-04-29 10:17:27.000000000 -0400 -+++ src/Win_GParted.cc.new 2008-04-30 09:42:28.000000000 -0400 -@@ -263,7 +263,8 @@ - combo_devices .pack_start( treeview_devices_columns .device ) ; - combo_devices .pack_start( treeview_devices_columns .size, false ) ; - -- combo_devices .signal_changed() .connect( sigc::mem_fun(*this, &Win_GParted::combo_devices_changed) ); -+ combo_devices_signal_changed_id = -+ combo_devices .signal_changed() .connect( sigc::mem_fun(*this, &Win_GParted::combo_devices_changed) ); - - hbox_toolbar .pack_start( combo_devices, Gtk::PACK_SHRINK ) ; - } -@@ -510,6 +511,7 @@ - - void Win_GParted::refresh_combo_devices() - { -+ combo_devices_signal_changed_id .block() ; - liststore_devices ->clear() ; - - menu = manage( new Gtk::Menu() ) ; -@@ -546,6 +548,7 @@ - menubar_main .items()[ 0 ] .get_submenu() ->items()[ 1 ] .set_submenu( *menu ) ; - } - -+ combo_devices_signal_changed_id .unblock() ; - combo_devices .set_active( current_device ) ; - } - -@@ -929,13 +932,8 @@ - - void Win_GParted::combo_devices_changed() - { -- unsigned int old_current_device = current_device; - //set new current device - current_device = combo_devices .get_active_row_number() ; -- if ( current_device == (unsigned int) -1 ) -- current_device = old_current_device; -- if ( current_device >= devices .size() ) -- current_device = 0 ; - set_title( String::ucompose( _("%1 - GParted"), devices[ current_device ] .get_path() ) ); - - //refresh label_device_info diff --git a/gparted.spec b/gparted.spec index 2737141..9c66c41 100644 --- a/gparted.spec +++ b/gparted.spec @@ -1,6 +1,6 @@ Summary: Gnome Partition Editor Name: gparted -Version: 0.3.7 +Version: 0.3.8 Release: 1%{?dist} Group: Applications/System License: GPLv2+ @@ -8,7 +8,6 @@ URL: http://gparted.sourceforge.net Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 Source1: gparted-console.apps Source2: gparted-pam.d -Patch0: gparted-refresh_crash-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel parted-devel BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) @@ -24,7 +23,6 @@ will be detected at runtime and don't require a rebuild of GParted %prep %setup -q -%patch0 -p0 -b .refresh %build %configure @@ -40,7 +38,7 @@ desktop-file-install --delete-original \ --mode 0644 \ --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/%{name}.desktop -sed -i 's#sbin#bin#' %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop + %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop #### consolehelper stuff mkdir -p %{buildroot}%{_bindir} @@ -77,6 +75,9 @@ fi %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Sun Jul 13 2008 Deji Akingunola - 0.3.8-1 +- New upstream version + * Wed Apr 30 2008 Deji Akingunola - 0.3.7-1 - New upstream version diff --git a/run-gparted b/run-gparted deleted file mode 100644 index 313789f..0000000 --- a/run-gparted +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/usr/bin/hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive --run /usr/sbin/gparted diff --git a/sources b/sources index be444dc..fee303f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a96ab9b8871a58b6ca74941c30ab812 gparted-0.3.7.tar.bz2 +7c890472168b0b5e5f353b445758ab3f gparted-0.3.8.tar.bz2