rpms/nautilus-actions/F-11 import.log, NONE, 1.1 nact-gnome_vfs_workaround.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 nautilus-actions.spec, 1.19, 1.20 sources, 1.7, 1.8

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/nautilus-actions/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10690/F-11

Modified Files:
	.cvsignore nautilus-actions.spec sources 
Added Files:
	import.log nact-gnome_vfs_workaround.patch 
Log Message:
Update to latest svn snapshot and apply a patch to fix bug 499944


--- NEW FILE import.log ---
nautilus-actions-1_9-0_5_svn20090508_fc11:F-11:nautilus-actions-1.9-0.5.svn20090508.fc11.src.rpm:1241877645

nact-gnome_vfs_workaround.patch:

--- NEW FILE nact-gnome_vfs_workaround.patch ---
--- plugin/nautilus-actions.c	2009-05-09 08:23:25.380880257 -0400
+++ plugin/nautilus-actions.c.new	2009-05-09 08:37:59.586506775 -0400
@@ -236,6 +236,17 @@
 
 static void nautilus_actions_instance_init (GTypeInstance *instance, gpointer klass)
 {
+	// TODO: GnomeVFS needs to be initialized before gnome_vfs methods
+	// can be used. Since GnomeVFS has been deprecated it would be
+	// a good idea to rewrite this extension to use equivelant methods
+	// from GIO/GVFS.
+	//
+	// plugins/nautilus-actions-utils.c:nautilus_actions_utils_parse_parameter 
+	// is the only function that makes use of gnome_vfs methods.
+	//
+	// See: Bug #574919
+	gnome_vfs_init ();
+	
 	NautilusActions* self = NAUTILUS_ACTIONS (instance);
 	
 	self->configs = NULL;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	23 Oct 2008 16:56:34 -0000	1.7
+++ .cvsignore	9 May 2009 14:01:08 -0000	1.8
@@ -1 +1 @@
-nautilus-actions-svn20081020.tar.gz
+nautilus-actions-svn20090508.tar.gz


Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/F-11/nautilus-actions.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- nautilus-actions.spec	26 Feb 2009 04:19:25 -0000	1.19
+++ nautilus-actions.spec	9 May 2009 14:01:09 -0000	1.20
@@ -1,22 +1,21 @@
 Summary:	Nautilus extension for customizing the context menu
 Name:		nautilus-actions
 Version:	1.9
-Release:	0.4.svn20081020%{?dist}
+Release:	0.5.svn20090508%{?dist}
 Group:		User Interface/Desktops
 License:	GPLv2+
 URL:		http://www.grumz.net/node/8
 #Source0:	ftp://ftp2.grumz.net/grumz/%{name}-%{version}.tar.gz
 # Tarball generated from svn checkout on the date referenced in the spec
 # 'Release' field. The tarball can be re-generated as follows;
-#  svn co -r 510 http://svn.gnome.org/svn/nautilus-actions/trunk/ nautilus-actions-svn20081020
-#  cd nautilus-actions-svn20081020 && ./autogen.sh
-Source0:	%{name}-svn20081020.tar.gz
+#  svn co -r 510 http://svn.gnome.org/svn/nautilus-actions/trunk/ nautilus-actions-svn20090508
+#  cd nautilus-actions-svn20090508 && ./autogen.sh
+Source0:	%{name}-svn20090508.tar.gz
+Patch0:		nact-gnome_vfs_workaround.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libgnomeui-devel, libglade2-devel, nautilus-devel
 BuildRequires:	e2fsprogs-devel, gettext, perl(XML::Parser)
 BuildRequires:	desktop-file-utils intltool
-Requires(pre):	GConf2
-Requires(preun):GConf2
 
 %description
 Nautilus actions is an extension for Nautilus, the GNOME file manager.
@@ -24,10 +23,11 @@ It provides an easy way to configure pro
 selected in Nautilus interface
 
 %prep
-%setup -q -n %{name}-svn20081020
+%setup -q -n %{name}-svn20090508
+%patch0 -p0 -b .fix
 
 %build
-%configure --disable-schemas-install --enable-commandline-tool
+%configure --enable-commandline-tool
 make %{?_smp_mflags} 
 
 %install
@@ -52,40 +52,18 @@ desktop-file-install --delete-original		
 %clean
 rm -rf %{buildroot}
 
-%pre
-if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then 
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/config_newaction.schemas >/dev/null || :
-    killall -HUP gconfd-2 || :
-fi
-fi
-
-%preun
-if [ -s %{_sysconfdir}/gconf/schemas/config_newaction.schemas ]; then
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/config_newaction.schemas > /dev/null || :
-    gconftool-2 --recursive-unset /apps/nautilus-actions
-    gconftool-2 --recursive-unset /schemas/apps/nautilus-actions
-    killall -HUP gconfd-2 || :
-fi
-fi
-
 %post
 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
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
@@ -98,6 +76,11 @@ fi
 %{_datadir}/applications/fedora-nact.desktop
 
 %changelog
+* Sat May 09 2009 Deji Akingunola <dakingun at gmail.com> - 1.9-0.5.svn20090508
+- Update to a svn snapshot with translations build fix
+- Apply patch to call gnome_vfs_init (fix Fedora bug #499944)
+- Clean up spec of old crufts
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-0.4.svn20081020
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-actions/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	23 Oct 2008 16:56:34 -0000	1.7
+++ sources	9 May 2009 14:01:09 -0000	1.8
@@ -1 +1 @@
-811a678314234cc2557759e64e9a4d3a  nautilus-actions-svn20081020.tar.gz
+4e33b679ef50ab115704675a2498f0df  nautilus-actions-svn20090508.tar.gz