[Gaim-commits] SF.net SVN: gaim: [17249] trunk/gaim.spec.in

[<rl...@us...>]

Revision: 17249
          http://svn.sourceforge.net/gaim/?rev=17249&view=rev
Author:   rlaager
Date:     2006-09-11 00:14:39 -0700 (Mon, 11 Sep 2006)

Log Message:
-----------
Don't depend on GConf2. Only use gconftool-2 if it's already installed.

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-09-11 07:06:03 UTC (rev 17248)
+++ trunk/gaim.spec.in	2006-09-11 07:14:39 UTC (rev 17249)
@@ -42,9 +42,6 @@
 # For some reason perl isn't always automatically detected as a requirement :(
 Requires: perl
 
-# For gconftool-2
-Requires: GConf2
-
 # Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
 %if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva"
 # Mandrake/Mandriva requirements
@@ -248,9 +245,8 @@
 rm -rf %{buildroot}
 
 %post
-# From: http://www.gnome.org/projects/gconf/
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null
+# Modified from the sample at: http://www.gnome.org/projects/gconf/
+[ -n "`which gconftool-2 2>/dev/null`" ] && GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null
 
 %files -f %{name}-%{version}-coreplugins
 %defattr(-, root, root)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.