rpms/nautilus-actions/FC-5 .cvsignore, 1.3, 1.4 nautilus-actions.spec, 1.4, 1.5 sources, 1.3, 1.4

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13881

Modified Files:
	.cvsignore nautilus-actions.spec sources 
Log Message:
* Mon May 01 2006 Deji Akingunola <dakingun at gmail.com> - 1.2-1
- Update to version 1.2
- Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Feb 2006 22:32:43 -0000	1.3
+++ .cvsignore	1 May 2006 16:26:44 -0000	1.4
@@ -1 +1 @@
-nautilus-actions-1.0.tar.gz
+nautilus-actions-1.2.tar.gz


Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-5/nautilus-actions.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nautilus-actions.spec	13 Feb 2006 21:01:42 -0000	1.4
+++ nautilus-actions.spec	1 May 2006 16:26:44 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
-Version: 1.0
-Release: 2%{?dist}
+Version: 1.2
+Release: 1%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -30,8 +30,6 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-cp -pr %{buildroot}/%{_datadir}/{nautilus-actions/nact,pixmaps}/nautilus-actions-icon.png
-
 rm -rf %{buildroot}/%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.la
 rm -rf %{buildroot}%{_datadir}/applications/fedora-nact.desktop
 
@@ -48,14 +46,17 @@
 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 \
@@ -64,6 +65,19 @@
     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 || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -73,10 +87,14 @@
 %{_bindir}/nautilus-actions-new-config
 %{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so
 %{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/*/apps/nautilus-actions.*
 %{_datadir}/applications/fedora-nact.desktop
-%{_datadir}/pixmaps/nautilus-actions-icon.png
 
 %changelog
+* Mon May 01 2006 Deji Akingunola <dakingun at gmail.com> - 1.2-1
+- Update to version 1.2
+- Make sure fix for upgrade from ver. < 1.0 doesn't throw up errors
+
 * Mon Feb 13 2006 Deji Akingunola <dakingun at gmail.com> - 1.0-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Feb 2006 22:32:43 -0000	1.3
+++ sources	1 May 2006 16:26:44 -0000	1.4
@@ -1 +1 @@
-fde8d7ad832009bfd1746bf076e8a838  nautilus-actions-1.0.tar.gz
+d1d4bf81c0f611610d33cfec59c5e549  nautilus-actions-1.2.tar.gz