rpms/pcmanfm/F-9 pcmanfm-0.5-exec-from-non-terminal.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 pcmanfm.spec, 1.22, 1.23 sources, 1.19, 1.20

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/pcmanfm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29845/F-9

Modified Files:
	.cvsignore pcmanfm.spec sources 
Added Files:
	pcmanfm-0.5-exec-from-non-terminal.patch 
Log Message:
* Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.1-1
- Update to 0.5.1
- Remove icon name fallback hack
- Still enable 2 patches


pcmanfm-0.5-exec-from-non-terminal.patch:

--- NEW FILE pcmanfm-0.5-exec-from-non-terminal.patch ---
--- pcmanfm-0.5/src/vfs/vfs-execute.c.debug	2008-05-25 21:59:15.000000000 +0900
+++ pcmanfm-0.5/src/vfs/vfs-execute.c	2009-04-06 17:26:14.000000000 +0900
@@ -131,8 +131,8 @@
         {
             if ( 0 == strncmp( envp[ i ], "DESKTOP_STARTUP_ID=", 19 ) )
                 startup_id_index = i;
-            new_env[i] = g_strdup( envp[ i ] );
         }
+        new_env[i] = g_strdup( envp[ i ] );
     }
 
     display = sn_display_new ( GDK_SCREEN_XDISPLAY ( screen ),
@@ -170,8 +170,11 @@
 
     /* This is taken from gdk_spawn_on_screen */
     display_name = gdk_screen_make_display_name ( screen );
-    if ( display_index >= 0 )
+    if ( display_index >= 0 ){
+        /* Now display_index points to the last entry of "DISPLAY=" */
+        g_free(new_env[ display_index ]);
         new_env[ display_index ] = g_strconcat( "DISPLAY=", display_name, NULL );
+    }
     else
         new_env[ i++ ] = g_strconcat( "DISPLAY=", display_name, NULL );
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/F-9/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	17 Jul 2008 08:03:50 -0000	1.19
+++ .cvsignore	3 Jun 2009 19:31:58 -0000	1.20
@@ -1 +1 @@
-pcmanfm-0.5.tar.gz
+pcmanfm-0.5.1.tar.bz2


Index: pcmanfm.spec
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/F-9/pcmanfm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- pcmanfm.spec	17 Jul 2008 08:03:50 -0000	1.22
+++ pcmanfm.spec	3 Jun 2009 19:31:58 -0000	1.23
@@ -2,15 +2,18 @@
 %define		enable_hal	1
 
 Name:		pcmanfm
-Version:	0.5
+Version:	0.5.1
 Release:	1%{?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
+Source0:	http://downloads.sourceforge.net/pcmanfm/%{name}-%{version}.tar.bz2
 Patch0:		pcmanfm-0.5-kill-find-immediately.patch
+Patch1:		pcmanfm-0.5-icon-fallback.patch
+# Sent upstream (sf bug 2313286)
+Patch10:	pcmanfm-0.5-exec-from-non-terminal.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	dbus-glib-devel
@@ -30,6 +33,44 @@ which features tabbed browsing and user-
 %prep
 %setup -q
 %patch0 -p1 -b .search_hang
+%patch10 -p1 -b .non_terminal
+
+%if 0%{?fedora} >= 10 && 0
+function replace_icon(){
+	find . -name \*.c | xargs grep -l $1 | \
+		xargs %{__sed} -i -e "s|\"$1\"|\"$2\"|"
+}
+
+replace_icon	gnome-dev-cdrom		gtk-cdrom
+replace_icon	gnome-dev-floppy	media-floppy
+replace_icon	gnome-dev-disc-cdr	gtk-cdrom
+replace_icon	gnome-dev-disc-cdrw	gtk-cdrom
+for type in \
+	gnome-dev-disc-dvdrom gnome-dev-disc-dvdram \
+	gnome-dev-disc-dvdrw gnome-dev-disc-dvdr-plus
+	do
+		replace_icon $type media-optical-dvd
+done
+replace_icon	gnome-dev-harddisk	drive-harddisk
+replace_icon	gnome-dev-harddisk-usb	drive-harddisk-usb
+replace_icon	gnome-dev-harddisk-1394		drive-harddisk-ieee1394
+replace_icon	gnome-dev-media-cf	media-flash-cf
+replace_icon	gnome-dev-media-ms	media-flash-ms
+replace_icon	gnome-dev-media-sm	media-flash-sm
+replace_icon	gnome-dev-media-sdmmc	media-flash-sd
+replace_icon	gnome-dev-removable	drive-removable-media
+replace_icon	gnome-dev-removable-1394	drive-removable-media-ieee1394
+replace_icon	gnome-dev-removable-usb		drive-removable-media-usb
+replace_icon	gnome-fs-desktop	user-desktop
+replace_icon	gnome-fs-directory	gtk-directory
+replace_icon	gnome-fs-home		user-home
+replace_icon	gnome-fs-trash-empty	user-trash
+#replace_icon	gnome-mime-		''
+replace_icon	gnome-mime-application-x-executable	\
+	application-x-executable
+
+%patch1 -p1 -b .icon_
+%endif
 
 # permission fix
 %{__chmod} 0644 \
@@ -96,6 +137,28 @@ exit 0
 %{_datadir}/mime/packages/*.xml
 
 %changelog
+* Thu Jun  4 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5.1-1
+- Update to 0.5.1
+- Remove icon name fallback hack
+- Still enable 2 patches
+
+* Mon Apr  6 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-7
+- Fix the issue when application cannot be lauched from desktop menu
+  (sourceforge bug 2313286)
+
+* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-6
+- F-11: Mass rebuild
+
+* Fri Aug  8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-5
+- More fallback
+
+* Wed Jul 30 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-4
+- More fallback for gnome-icon-theme 2.23.X (F-10)
+
+* Tue Jul 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-2
+- F-10+: Use more generic icon name due to gnome-icon-theme 2.23.X change
+  First try (need more fix)
+
 * Thu Jul 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.5-1
 - 0.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcmanfm/F-9/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	17 Jul 2008 08:03:50 -0000	1.19
+++ sources	3 Jun 2009 19:31:58 -0000	1.20
@@ -1 +1 @@
-fe1a836eed6a42107e7d71a01a52f7ec  pcmanfm-0.5.tar.gz
+72daf7c19c66d365b000170d7b254f40  pcmanfm-0.5.1.tar.bz2