[guake/f14/master] - Import fix for bug 626303 - Remove fr.po now in the sources - Update to 0.4.2-2

[Pierre-YvesChibon]

commit 87a5cc07a152baa6bb318ce1ddb8c390031be4f4
Author: pingou <pingou at pingoured.fr>
Date:   Tue Aug 24 09:10:10 2010 +0200

    - Import fix for bug 626303
    - Remove fr.po now in the sources
    - Update to 0.4.2-2

 0001-Retrieve-port-as-int.patch |   25 ++
 fr.po                           |  489 ---------------------------------------
 guake.spec                      |    8 +-
 3 files changed, 32 insertions(+), 490 deletions(-)
---
diff --git a/0001-Retrieve-port-as-int.patch b/0001-Retrieve-port-as-int.patch
new file mode 100644
index 0000000..3fde26d
--- /dev/null
+++ b/0001-Retrieve-port-as-int.patch
@@ -0,0 +1,25 @@
+From efcd1d8d3cdc354f46bc2485e7e3394f8578b7ba Mon Sep 17 00:00:00 2001
+From: pingou <pingou at pingoured.fr>
+Date: Mon, 23 Aug 2010 09:54:35 +0200
+Subject: [PATCH] Retrieve port as int
+
+---
+ src/guake.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/guake.py b/src/guake.py
+index 6214fb2..40e688f 100644
+--- a/src/guake.py
++++ b/src/guake.py
+@@ -1099,7 +1099,7 @@ class Guake(SimpleGladeApp):
+                 ssl_port = port
+             else:
+                 ssl_host = self.client.get_string('/system/proxy/secure_host')
+-                ssl_port = self.client.get_string('/system/proxy/secure_port')
++                ssl_port = self.client.get_int('/system/proxy/secure_port')
+ 
+             if self.client.get_bool(proxy + 'use_authentication'):
+                 auth_user = self.client.get_string(
+-- 
+1.7.2.1
+
diff --git a/guake.spec b/guake.spec
index 9ca361c..77bbc94 100644
--- a/guake.spec
+++ b/guake.spec
@@ -1,12 +1,13 @@
 Name:           guake
 Version:        0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Drop-down terminal for GNOME
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.guake.org/
 Source0:        http://guake.org/files/%{name}-%{version}.tar.gz
+Patch0:        0001-Retrieve-port-as-int.patch
 
 # Not used here -- official release --
 #Source0:        %{name}-%{version}.20090321git.tar.gz
@@ -40,6 +41,8 @@ and press again to hide.
 # Enables to pass the configure without problem concerning python vte library
 sed -i -e 's|if test -z "$ac_pvte_result"; then|if test -z "" ; then|g' configure
 
+%patch0 -p1 -b .
+
 %build
 %configure --disable-schemas-install --disable-static
 make %{?_smp_mflags}
@@ -96,6 +99,9 @@ killall -HUP gconfd-2 > /dev/null || :
 %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Tue Aug 24 2010 pingou <pingou at pingoured.fr> - 0.4.2-2
+- Fix 626303 (import of port from proxy as int and not as string)
+
 * Tue Aug 03 2010 pingou <pingou at pingoured.fr> - 0.4.2-1
 - Update to 0.4.2