rpms/gparted/EL-5 gparted-epel-build-workaround.patch, NONE, 1.1 gparted.spec, 1.20, 1.21 sources, 1.12, 1.13 gparted-devices.patch, 1.1, NONE gparted-realpath-fix.patch, 1.1, NONE gparted-refresh_crash-fix.patch, 1.1, NONE

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/gparted/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19060

Modified Files:
	gparted.spec sources 
Added Files:
	gparted-epel-build-workaround.patch 
Removed Files:
	gparted-devices.patch gparted-realpath-fix.patch 
	gparted-refresh_crash-fix.patch 
Log Message:
* Mon Jan 18 2010 Deji Akingunola <dakingun at gmail.com> - 0.4.8-1
- New upstream version
- Remove the hal policy file created by gparted (if it's still there)
 on upgrade (Should fix BZ #550590)


gparted-epel-build-workaround.patch:
 Win_GParted.cc |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE gparted-epel-build-workaround.patch ---
--- src/Win_GParted.cc	2009-10-26 16:50:12.000000000 -0400
+++ src/Win_GParted.cc.new	2010-01-18 11:14:53.505380384 -0500
@@ -69,14 +69,14 @@
 	this ->set_title( _("GParted") );
 	this ->set_default_size( 775, 500 );
 	
-	try
-	{
-		this ->set_default_icon_name( "gparted" ) ;
-	}
-	catch ( Glib::Exception & e )
-	{ 
-		std::cout << e .what() << std::endl ;
-	} 
+	//try
+	//{
+	//	this ->set_default_icon_name( "gparted" ) ;
+	//}
+	//catch ( Glib::Exception & e )
+	//{ 
+	//	std::cout << e .what() << std::endl ;
+	//} 
 	
 	//Pack the main box
 	this ->add( vbox_main ); 


Index: gparted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/EL-5/gparted.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- gparted.spec	17 Dec 2007 01:23:36 -0000	1.20
+++ gparted.spec	18 Jan 2010 17:13:55 -0000	1.21
@@ -1,18 +1,19 @@
 Summary: Gnome Partition Editor
 Name:    gparted
-Version: 0.3.3
-Release: 4%{?dist}
+Version: 0.4.8
+Release: 1%{?dist}
 Group:   Applications/System
-License: GPL
+License: GPLv2+
 URL:     http://gparted.sourceforge.net
-Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0:	 gparted-devices.patch
-Patch1:	 gparted-realpath-fix.patch
-Patch2:	 gparted-refresh_crash-fix.patch
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:  gparted-epel-build-workaround.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
+BuildRequires: desktop-file-utils gnome-doc-utils
+BuildRequires:  scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -23,9 +24,7 @@ will be detected at runtime and don't re
 
 %prep
 %setup -q
-%patch0 -p0 -b .devs
-%patch1 -p0 -b .realpath
-%patch2 -p0 -b .refresh
+%patch0 -p0 -b .epel
 
 %build
 %configure
@@ -35,15 +34,19 @@ make %{?_smp_mflags} 
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
+sed -i 's#_X-GNOME-FullName#X-GNOME-FullName#' %{buildroot}%{_datadir}/applications/%{name}.desktop
+
 desktop-file-install --delete-original                   \
         --vendor fedora                                  \
         --dir %{buildroot}%{_datadir}/applications       \
 	--mode 0644				         \
         %{buildroot}%{_datadir}/applications/%{name}.desktop
+sed -i 's#sbin#bin#' %{buildroot}%{_datadir}/applications/fedora-%{name}.desktop
+
+rm -rf %{buildroot}/var
 
-#### consolehelper stuff (stolen from extras' synaptic)
-mkdir -p %{buildroot}%{_sbindir}
-mv %{buildroot}%{_bindir}/gparted %{buildroot}%{_sbindir}/
+#### consolehelper stuff
+mkdir -p %{buildroot}%{_bindir}
 ln -s consolehelper %{buildroot}%{_bindir}/gparted
 
 mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
@@ -71,17 +74,49 @@ EOF
 %clean
 rm -rf %{buildroot}
 
+%preun
+if [ $1 -ge 0 ]; then
+    if [ -a %{_datadir}/hal/fdi/policy/gparted-disable-automount.fdi ]; then
+       rm -rf %{_datadir}/hal/fdi/policy/gparted-disable-automount.fdi
+    fi
+fi
+
+%post
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+scrollkeeper-update -q || :
+
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/gparted
 %{_sbindir}/gparted
+%{_sbindir}/gpartedbin
 %{_datadir}/applications/fedora-gparted.desktop
-%{_datadir}/pixmaps/gparted.png
+%{_datadir}/icons/hicolor/*/apps/gparted.*
+%{_datadir}/gnome/help/gparted/
+%{_datadir}/omf/gparted/
+%{_mandir}/man8/gparted.*
 %config(noreplace) %{_sysconfdir}/pam.d/gparted
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Jan 18 2010 Deji Akingunola <dakingun at gmail.com> - 0.4.8-1
+- New upstream version
+- Remove the hal policy file created by gparted (if it's still there)
+ on upgrade (Should fix BZ #550590)
+
 * Sun Dec 16 2007 Deji Akingunola <dakingun at gmail.com> - 0.3.3-4
 - Branch off for EL-5
 - Apply a couple of patches from F-7 branch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gparted/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	7 Dec 2006 07:12:20 -0000	1.12
+++ sources	18 Jan 2010 17:13:55 -0000	1.13
@@ -1 +1 @@
-f3d16ccfda72fa1dac9fa1ff9ded2c42  gparted-0.3.3.tar.bz2
+2433b628df9c6cae2022a54d27368dc4  gparted-0.4.8.tar.bz2


--- gparted-devices.patch DELETED ---


--- gparted-realpath-fix.patch DELETED ---


--- gparted-refresh_crash-fix.patch DELETED ---