rpms/vino/devel vino.spec,1.41,1.42

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/vino/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28151

Modified Files:
	vino.spec 
Log Message:
fix scripts



Index: vino.spec
===================================================================
RCS file: /cvs/dist/rpms/vino/devel/vino.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- vino.spec	17 Oct 2006 21:35:45 -0000	1.41
+++ vino.spec	18 Oct 2006 19:31:01 -0000	1.42
@@ -1,19 +1,20 @@
 %define gtk2_version 2.6.0
 %define libglade2_version 2.3.6
-%define gconf2_version 2.6.0
+%define gconf2_version 2.14.0
 %define libgnomeui_version 2.6.0
 %define libgcrypt_version 1.2.0
 
 Summary: A remote desktop system for GNOME
 Name: vino
 Version: 2.13.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
 
+Requires(pre): GConf2 >= %{gconf2_version}
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
@@ -77,15 +78,23 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/vino-server.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/vino-server.schemas > /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/vino-server.schemas > /dev/null || :
+fi
+
 %preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/vino-server.schemas > /dev/null
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/vino-server.schemas > /dev/null || :
+fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor
@@ -105,8 +114,11 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-6
+- Fix scripts according to the packaging guidelines
+
 * Tue Oct 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.13.5-5
-- Fix #191160, #210855
+- Fix #191160
 
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.13.5-4.1
 - rebuild