rpms/pcmanfm/F-8 pcmanfm-0.3.5.23-crash-on-64bits.patch, NONE, 1.1 pcmanfm-0.3.5.23-disable-mount-removable-device.patch, NONE, 1.1 pcmanfm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/pcmanfm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20944/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	pcmanfm-0.3.5.23-crash-on-64bits.patch 
	pcmanfm-0.3.5.23-disable-mount-removable-device.patch 
	pcmanfm.spec 
Log Message:
Initial import

pcmanfm-0.3.5.23-crash-on-64bits.patch:

--- NEW FILE pcmanfm-0.3.5.23-crash-on-64bits.patch ---
--- pcmanfm-0.3.5.23/src/mime-type/mime-action.h~	2008-02-17 20:03:24.000000000 +0100
+++ pcmanfm-0.3.5.23/src/mime-type/mime-action.h	2008-02-17 20:03:24.000000000 +0100
@@ -19,8 +19,8 @@
  *      MA 02110-1301, USA.
  */
 
-#ifndef _MIME_TYPE_H_INCLUDED_
-#define _MIME_TYPE_H_INCLUDED_
+#ifndef _MIME_ACTION_H_INCLUDED_
+#define _MIME_ACTION_H_INCLUDED_
 
 #include <glib.h>
 

pcmanfm-0.3.5.23-disable-mount-removable-device.patch:

--- NEW FILE pcmanfm-0.3.5.23-disable-mount-removable-device.patch ---
--- pcmanfm-0.3.5.23/src/ptk/ptk-location-view.c.debug	2008-02-13 13:57:16.000000000 +0900
+++ pcmanfm-0.3.5.23/src/ptk/ptk-location-view.c	2008-02-18 23:40:25.000000000 +0900
@@ -546,10 +546,19 @@
 
             if ( ! vfs_volume_mount( vol, &err ) )
             {
+#if 0
                 ptk_show_error( GTK_WINDOW( toplevel ),
                                 _( "Unable to mount device" ),
                                 err->message);
                 g_error_free( err );
+#else
+		ptk_show_error( GTK_WINDOW( toplevel ),
+			("Mount disabled"),
+			"Mounting removable devices by pcmanfm is currently "
+			"disabled by Fedora maintainer due to bugs in pcmanfm. "
+			"Needs investigating."
+		);
+#endif
             }
 
             /* Run main loop to process HAL events or volume info won't get updated correctly. */
@@ -575,8 +584,16 @@
     if( ! vfs_volume_mount( vol, &err ) )
     {
         show_ready( view );
+#if 0
         ptk_show_error( NULL, _("Unable to mount device"), err->message );
         g_error_free( err );
+#else
+	ptk_show_error( NULL, ("Mount disabled"),
+		"Mounting removable devices by pcmanfm is currently "
+		"disabled by Fedora maintainer due to bugs in pcmanfm. "
+		"Needs investigating."
+		);
+#endif
     }
     else
         show_ready( view );
--- pcmanfm-0.3.5.23/src/vfs/vfs-volume-hal.c.debug	2008-02-13 13:57:17.000000000 +0900
+++ pcmanfm-0.3.5.23/src/vfs/vfs-volume-hal.c	2008-02-18 21:59:09.000000000 +0900
@@ -2763,6 +2763,7 @@
 
 gboolean vfs_volume_mount( VFSVolume* vol, GError** err )
 {
+    return FALSE;
     ExoMountHalDevice* device;
     gboolean ret = FALSE;
     device = vfs_volume_hal_from_udi( vol->udi, err );


--- NEW FILE pcmanfm.spec ---
%define		enable_inotify	0
%define		enable_hal	1

Name:		pcmanfm
Version:	0.3.5.23
Release:	2%{?dist}
Summary:	Extremly fast and lightweight file manager

Group:		User Interface/Desktops
License:	GPLv2+
URL:		http://pcmanfm.sourceforge.net/
Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.gz
Patch0:		pcmanfm-0.3.5.23-crash-on-64bits.patch
Patch1:		pcmanfm-0.3.5.23-disable-mount-removable-device.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	dbus-glib-devel
BuildRequires:	gamin-devel
BuildRequires:	gtk2-devel
BuildRequires:	hal-devel >= 0.5.0
BuildRequires:	startup-notification-devel

BuildRequires:	desktop-file-utils
BuildRequires:	gettext

%description
PCMan File Manager is an extremly fast and lightweight file manager 
which features tabbed browsing and user-friendly interface.

%prep
%setup -q
%patch0 -p1 -b .64bits
%patch1 -p1 -b .mount

# permission fix
%{__chmod} 0644 \
	[A-Z]*

%build
%configure \
%if %{enable_hal} >= 1
	--enable-hal \
%else
	--disable-hal \
%endif
%if %{enable_inotify} >= 1
	--enable-inotify
%else
	--disable-inotify
%endif

%{__make} %{?_smp_mflags}


%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__make} install \
	DESTDIR=$RPM_BUILD_ROOT \
	INSTALL="%{__install} -p"

desktop-file-install \
	--delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--remove-category 'Application' \
	--vendor 'fedora' \
	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

%find_lang %{name}

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%post
update-desktop-database &> /dev/null
update-mime-database %{_datadir}/mime &> /dev/null
exit 0

%postun
update-desktop-database &> /dev/null
update-mime-database %{_datadir}/mime &> /dev/null
exit 0

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc	AUTHORS
%doc	COPYING
%doc	TODO

%{_bindir}/%{name}

%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/mime/packages/*.xml

%changelog
* Mon Feb 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.5.23-2
- Apply patch to fix crash on 64bits arch as suggested by Hans
  (bug 433182)
- Disable to mount removable devices for now

* Sun Feb 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.3.5.23-1
- Initial draft
- Disable inotify support, too buggy (also default is no currently)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Feb 2008 17:46:31 -0000	1.1
+++ .cvsignore	18 Feb 2008 18:11:23 -0000	1.2
@@ -0,0 +1 @@
+pcmanfm-0.3.5.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Feb 2008 17:46:31 -0000	1.1
+++ sources	18 Feb 2008 18:11:23 -0000	1.2
@@ -0,0 +1 @@
+501ee860f6985810062cb00f90c7c29a  pcmanfm-0.3.5.23.tar.gz