From 97e8bef63c939850b0da0a4f5770f3705e464ddc Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Wed, 30 Apr 2008 18:44:11 +0000 Subject: [PATCH] - New upstream version --- .cvsignore | 2 +- gparted-console.apps | 2 +- gparted-dont-lock-hal.patch | 79 --------------------------------- gparted-refresh_crash-fix.patch | 18 ++++---- gparted.spec | 50 +++++++++------------ sources | 2 +- 6 files changed, 32 insertions(+), 121 deletions(-) delete mode 100644 gparted-dont-lock-hal.patch diff --git a/.cvsignore b/.cvsignore index daf4568..315cb28 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gparted-0.3.6.tar.gz +gparted-0.3.7.tar.bz2 diff --git a/gparted-console.apps b/gparted-console.apps index d6c16d8..dc66795 100644 --- a/gparted-console.apps +++ b/gparted-console.apps @@ -1,3 +1,3 @@ USER=root -PROGRAM=/usr/bin/run-gparted +PROGRAM=/usr/sbin/gparted SESSION=true diff --git a/gparted-dont-lock-hal.patch b/gparted-dont-lock-hal.patch deleted file mode 100644 index 45898cd..0000000 --- a/gparted-dont-lock-hal.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- src/GParted_Core.cc 2008-03-26 11:00:50.000000000 -0400 -+++ src/GParted_Core.cc.new 2008-03-28 17:26:10.000000000 -0400 -@@ -39,8 +39,6 @@ - #include "../include/ufs.h" - - #include --#include --#include - #include - - std::vector libparted_messages ; //see ped_exception_handler() -@@ -48,13 +46,6 @@ - namespace GParted - { - --// Clean up the fdi when terminating --void sig_fdi_cleanup( int signum ) --{ -- remove( "/usr/share/hal/fdi/policy/gparted-disable-automount.fdi" ); -- raise( signum ); --} -- - GParted_Core::GParted_Core() - { - lp_device = NULL ; -@@ -64,44 +55,6 @@ - - ped_exception_set_handler( ped_exception_handler ) ; - -- //make sure that the fdi is cleaned up on all but the most forceful -- //program exits -- struct sigaction sa; -- sa.sa_handler = sig_fdi_cleanup; -- sigemptyset( &sa.sa_mask ); -- sa.sa_flags = SA_RESETHAND; -- if( sigaction( SIGHUP, &sa, NULL ) == -1 || -- sigaction( SIGINT, &sa, NULL ) == -1 || -- sigaction( SIGQUIT, &sa, NULL ) == -1 || -- sigaction( SIGILL, &sa, NULL ) == -1 || -- sigaction( SIGABRT, &sa, NULL ) == -1 || -- sigaction( SIGFPE, &sa, NULL ) == -1 || -- sigaction( SIGSEGV, &sa, NULL ) == -1 || -- sigaction( SIGPIPE, &sa, NULL ) == -1 || -- sigaction( SIGALRM, &sa, NULL ) == -1 || -- sigaction( SIGTERM, &sa, NULL ) == -1 || -- sigaction( SIGUSR1, &sa, NULL ) == -1 || -- sigaction( SIGUSR2, &sa, NULL ) == -1 || -- sigaction( SIGBUS, &sa, NULL ) == -1 || -- sigaction( SIGXCPU, &sa, NULL ) == -1 || -- sigaction( SIGXFSZ, &sa, NULL ) == -1 ) -- perror( "Could not set signal handler" ); -- -- //disable automount //FIXME: temporary hack, till i find a better solution... -- std::ofstream fdi_file( "/usr/share/hal/fdi/policy/gparted-disable-automount.fdi" ) ; -- if ( fdi_file ) -- { -- fdi_file << "" ; -- fdi_file << "" ; -- fdi_file << "" ; -- fdi_file << "false" ; -- fdi_file << "" ; -- fdi_file << "" ; -- fdi_file << "" ; -- -- fdi_file .close() ; -- } -- - //get valid flags ... - for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast( NULL ) ) ; - flag ; -@@ -2372,8 +2325,6 @@ - if ( p_filesystem ) - delete p_filesystem ; - -- //remove .fdi file.. -- remove( "/usr/share/hal/fdi/policy/gparted-disable-automount.fdi" ) ; - } - - } //GParted diff --git a/gparted-refresh_crash-fix.patch b/gparted-refresh_crash-fix.patch index 47a206e..6dcd617 100644 --- a/gparted-refresh_crash-fix.patch +++ b/gparted-refresh_crash-fix.patch @@ -1,6 +1,6 @@ ---- include/Win_GParted.h 2006-11-25 09:56:30.000000000 -0500 -+++ include/Win_GParted.h.new 2007-10-30 00:37:29.000000000 -0400 -@@ -233,6 +233,7 @@ +--- 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 ; @@ -8,9 +8,9 @@ GParted_Core gparted_core ; std::vector device_info ; ---- src/Win_GParted.cc 2008-02-04 09:35:47.000000000 -0500 -+++ src/Win_GParted.cc.new 2008-02-07 15:34:30.000000000 -0500 -@@ -260,7 +260,8 @@ +--- 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 ) ; @@ -20,7 +20,7 @@ hbox_toolbar .pack_start( combo_devices, Gtk::PACK_SHRINK ) ; } -@@ -502,6 +503,7 @@ +@@ -510,6 +511,7 @@ void Win_GParted::refresh_combo_devices() { @@ -28,7 +28,7 @@ liststore_devices ->clear() ; menu = manage( new Gtk::Menu() ) ; -@@ -538,6 +540,7 @@ +@@ -546,6 +548,7 @@ menubar_main .items()[ 0 ] .get_submenu() ->items()[ 1 ] .set_submenu( *menu ) ; } @@ -36,7 +36,7 @@ combo_devices .set_active( current_device ) ; } -@@ -916,13 +919,8 @@ +@@ -929,13 +932,8 @@ void Win_GParted::combo_devices_changed() { diff --git a/gparted.spec b/gparted.spec index 397ce69..2737141 100644 --- a/gparted.spec +++ b/gparted.spec @@ -1,22 +1,19 @@ Summary: Gnome Partition Editor Name: gparted -Version: 0.3.6 +Version: 0.3.7 Release: 1%{?dist} Group: Applications/System License: GPLv2+ URL: http://gparted.sourceforge.net -Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz -Source1: run-gparted -Source2: gparted-console.apps -Source3: gparted-pam.d -Patch0: gparted-dont-lock-hal.patch -Patch1: gparted-refresh_crash-fix.patch +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) BuildRequires: desktop-file-utils Requires: hal >= 0.5.9 -Requires: vim-common %description GParted stands for Gnome Partition Editor and is a graphical frontend to @@ -27,8 +24,7 @@ will be detected at runtime and don't require a rebuild of GParted %prep %setup -q -%patch0 -p0 -b .hal -%patch1 -p0 -b .refresh +%patch0 -p0 -b .refresh %build %configure @@ -44,21 +40,17 @@ desktop-file-install --delete-original \ --mode 0644 \ --add-category X-Fedora \ %{buildroot}%{_datadir}/applications/%{name}.desktop - -# Create a helper script to launch gparted using hal-lock -cp %{SOURCE1} %{buildroot}%{_bindir}/ -chmod 755 %{buildroot}%{_bindir}/run-gparted +sed -i 's#sbin#bin#' %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop #### consolehelper stuff -mkdir -p %{buildroot}%{_sbindir} -mv %{buildroot}%{_bindir}/gparted %{buildroot}%{_sbindir}/ +mkdir -p %{buildroot}%{_bindir} ln -s consolehelper %{buildroot}%{_bindir}/gparted mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps -cp %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/gparted +cp %{SOURCE1} %{buildroot}%{_sysconfdir}/security/console.apps/gparted mkdir -p %{buildroot}%{_sysconfdir}/pam.d -cp %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/gparted +cp %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/gparted %find_lang %{name} @@ -76,32 +68,30 @@ fi %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_bindir}/gparted -%{_bindir}/run-gparted %{_sbindir}/gparted +%{_sbindir}/gpartedbin %{_datadir}/applications/fedora-gparted.desktop %{_datadir}/pixmaps/gparted.png +%{_mandir}/man8/gparted.* %config(noreplace) %{_sysconfdir}/pam.d/gparted %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog -* Mon Apr 28 2008 Deji Akingunola - 0.3.6-1 -- New Release - -* Thu Feb 07 2008 Deji Akingunola - 0.3.5-1 +* Wed Apr 30 2008 Deji Akingunola - 0.3.7-1 - New upstream version -* Fri Jan 04 2008 Adam Tkac - 0.3.3-16 -- rebuild against new parted +* Fri Mar 28 2008 Deji Akingunola - 0.3.6-1 +- New upstream version -* Fri Dec 28 2007 Deji Akingunola - 0.3.3-15 -- Explicitly require vim-common (Bug #426769) +* Thu Feb 07 2008 Deji Akingunola - 0.3.5-1 +- New upstream version * Thu Nov 22 2007 Deji Akingunola - 0.3.3-14 - Fix to detect full path to device/partition pathname (Bug #395071) * Tue Oct 30 2007 Deji Akingunola - 0.3.3-13 -- Fix crash after refresh bug (Bug #309251, Fix by Jim Hayward) -- Fix to use realpath properly (Bug #313281, Fix by Jim Hayward) +- Fix crash after refresh bug (Bug #309251, patch by Jim Hayward) +- Fix to use realpath properly (Bug #313281, patch by Jim Hayward) * Wed Aug 22 2007 Deji Akingunola - 0.3.3-12 - Rebuild @@ -203,7 +193,7 @@ fi * Fri Nov 25 2005 Deji Akingunola - 0.0.9-2 - Add more buildrequires and cleanup spec file -* Fri Nov 25 2005 Deji Akingunola - 0.0.9-1 +* Fri Nov 25 2005 Deji Akingunola - 0.0.9-1 - Update to latest released version * Wed Oct 26 2005 Deji Akingunola - 0.0.8-1 diff --git a/sources b/sources index d4a9efc..be444dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f163a7d699bb664b2293593deb88d15 gparted-0.3.6.tar.gz +6a96ab9b8871a58b6ca74941c30ab812 gparted-0.3.7.tar.bz2