[guake/el6: 7/7] Merge branch 'master' into el6

[Pierre-YvesChibon]

commit b138b9362a85e82a8ea384fd1fcbf09c4a0648d2
Merge: 3c24d30 2a46bf3
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Sun Apr 21 15:10:42 2013 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	guake.spec

 ...o-include-the-port-number-when-there-is-o.patch |   25 ++++++++++++++++++
 ...clude-bpython-and-ipython-as-interpreters.patch |   27 ++++++++++++++++++++
 guake.spec                                         |   26 +++++++++++++++++-
 3 files changed, 76 insertions(+), 2 deletions(-)
---
diff --cc guake.spec
index 602cfc1,d13b942..afe7189
--- a/guake.spec
+++ b/guake.spec
@@@ -78,23 -83,16 +84,24 @@@ if [ "%{python_sitearch}" != "%{python_
  fi
  
  %pre
 -%gconf_schema_prepare %{name}
 +if [ "$1" -gt 1 ] ; then
 +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 +gconftool-2 --makefile-uninstall-rule \
 +%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
 +fi
  
  %post
 -%gconf_schema_upgrade %{name}
 +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 +gconftool-2 --makefile-install-rule \
 +%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
  
  %preun
 -%gconf_schema_remove %{name}
 -
 -%posttrans
 +if [ "$1" -eq 0 ] ; then
 +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 +gconftool-2 --makefile-uninstall-rule \
 +%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 +fi
+ killall gconfd-2 > /dev/null || :
  
  %files -f %{name}.lang
  %doc AUTHORS ChangeLog COPYING README TODO