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

[Pierre-YvesChibon]

commit 74524447a9f990dc46fae65ae52044c37a31988c
Merge: 31a8f89 5ade8a8
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Wed Aug 1 22:38:28 2012 +0200

    Merge branch 'master' into el6

 .gitignore                                      |    2 +
 0001-Fix-focus-issue-on-gnome-shell.patch       |   28 ++++++++
 0001-Fix-notification.patch                     |   59 +++++++++++++++++
 0001-Let-allow-the-signal.SIGTERM-to-fail.patch |   31 +++++++++
 0001-Retrieve-port-as-int.patch                 |   25 -------
 guake-pref.desktop                              |   11 ---
 guake.spec                                      |   78 +++++++++++++++++------
 sources                                         |    2 +-
 8 files changed, 179 insertions(+), 57 deletions(-)
---
diff --cc guake.spec
index da1e115,b8ec08b..b9bf703
--- a/guake.spec
+++ b/guake.spec
@@@ -7,8 -7,19 +7,20 @@@ Group:          Applications/Syste
  License:        GPLv2+
  URL:            http://www.guake.org/
  Source0:        http://guake.org/files/%{name}-%{version}.tar.gz
- Patch0:         0001-Retrieve-port-as-int.patch
- Patch1:         guake.fix.notification.patch
++
+ Patch0:         0001-Fix-focus-issue-on-gnome-shell.patch
+ Patch1:         0001-Fix-notification.patch
+ Patch2:         0001-Let-allow-the-signal.SIGTERM-to-fail.patch
+ 
+ # Not used here -- official release --
+ #Source0:        %{name}-%{version}.20090321git.tar.gz
+ # Source generated from
+ # git clone git://repos.guake-terminal.org/guake
+ # cd guake
+ # ./autogen.sh
+ # cd ../
+ # tar zcvf guake-0.3.1.20090321git.tar.gz guake/
+ # ---------------------------------------------
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
@@@ -34,9 -46,8 +47,7 @@@ sed -i -e "s|include <glib/gtypes.h>|in
  
  %patch0 -p1 -b .
  %patch1 -p1 -b .
 -%patch2 -p1 -b .
  
- sed -i -e "s|include <glib/gtypes.h>|include <glib.h>|" src/globalhotkeys/keybinder.h
- 
  %build
  %configure --disable-schemas-install --disable-static
  make %{?_smp_mflags}
@@@ -60,32 -70,26 +70,33 @@@ desktop-file-install --vendor="
  
  
  %find_lang %{name}
- rm -f %{buildroot}%{_libdir}/%{name}/globalhotkeys.la
-  
- %clean
- rm -rf $RPM_BUILD_ROOT
+ rm -f %{buildroot}%{python_sitearch}/%{name}/globalhotkeys.la
+ 
+ 
+ if [ "%{python_sitearch}" != "%{python_sitelib}" ]; then
+   mv %{buildroot}%{python_sitelib}/%{name}/* %{buildroot}%{python_sitearch}/%{name}/
+ 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
 -killall -HUP gconfd-2 > /dev/null || :
 +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
  
  %files -f %{name}.lang
- %defattr(-,root,root,-)
  %doc AUTHORS ChangeLog COPYING README TODO
  %{_sysconfdir}/gconf/schemas/%{name}.schemas
  %{_bindir}/%{name}