Mercurial > pidgin.yaz
changeset 14528:7f8ea7ffb1de
[gaim-migrate @ 17249]
Don't depend on GConf2. Only use gconftool-2 if it's already installed.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 11 Sep 2006 07:14:39 +0000 |
| parents | 50d1a1ecce57 |
| children | 82de2d93e40e |
| files | gaim.spec.in |
| diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/gaim.spec.in Mon Sep 11 07:06:03 2006 +0000 +++ b/gaim.spec.in Mon Sep 11 07:14:39 2006 +0000 @@ -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)