[telepathy-gabble] Explicitly state python in the shebang

Debarshi Ray rishi at fedoraproject.org
Tue Nov 5 15:57:35 UTC 2013


commit d77ed8b0bc23ae64a90ecee2c355bc031c0b1fe5
Author: Debarshi Ray <debarshir at gnome.org>
Date:   Tue Nov 5 16:57:36 2013 +0100

    Explicitly state python in the shebang

 ...le-Explicitly-state-python-in-the-shebang.patch |   24 ++++++++++++++++++++
 telepathy-gabble.spec                              |   19 ++++++++++-----
 2 files changed, 36 insertions(+), 7 deletions(-)
---
diff --git a/0001-xmpp-console-Explicitly-state-python-in-the-shebang.patch b/0001-xmpp-console-Explicitly-state-python-in-the-shebang.patch
new file mode 100644
index 0000000..746c369
--- /dev/null
+++ b/0001-xmpp-console-Explicitly-state-python-in-the-shebang.patch
@@ -0,0 +1,24 @@
+From d50ef3cd0065f29ac48215456f0970920d709a8b Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at freedesktop.org>
+Date: Tue, 5 Nov 2013 16:42:06 +0100
+Subject: [PATCH] xmpp-console: Explicitly state python in the shebang
+
+This will make sure that we are not running against an unwanted version
+of Python offered by a software collection.
+---
+ plugins/telepathy-gabble-xmpp-console | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/telepathy-gabble-xmpp-console b/plugins/telepathy-gabble-xmpp-console
+index 8b96469..ed7febd 100755
+--- a/plugins/telepathy-gabble-xmpp-console
++++ b/plugins/telepathy-gabble-xmpp-console
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ # vim: set fileencoding=utf-8 sts=4 sw=4 et :
+ """
+ The world's worst XMPP console user interface.
+-- 
+1.8.4.2
+
diff --git a/telepathy-gabble.spec b/telepathy-gabble.spec
index e08b48d..a386692 100644
--- a/telepathy-gabble.spec
+++ b/telepathy-gabble.spec
@@ -6,7 +6,7 @@
 
 Name:           telepathy-gabble
 Version:        0.18.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Jabber/XMPP connection manager
 
 Group:          Applications/Communications
@@ -14,23 +14,24 @@ License:        LGPLv2+
 URL:            http://telepathy.freedesktop.org/wiki/
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 Patch1:         telepathy-gabble-0.18.0-build.patch
+Patch2:         0001-xmpp-console-Explicitly-state-python-in-the-shebang.patch
 
 BuildRequires:  dbus-devel >= 1.1.0
 BuildRequires:  dbus-glib-devel >= 0.82
 BuildRequires:  telepathy-glib-devel >= 0.19.9
 BuildRequires:  glib2-devel >= 2.32
-BuildRequires:	sqlite-devel
+BuildRequires:  sqlite-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  libsoup-devel
-BuildRequires:	libnice-devel >= 0.0.11
-BuildRequires:	cyrus-sasl-devel
+BuildRequires:  libnice-devel >= 0.0.11
+BuildRequires:  cyrus-sasl-devel
 BuildRequires:  libxslt
 %if %{run_tests}
 # Build Requires needed for tests.
 BuildRequires:  python
-BuildRequires:	python-twisted
-BuildRequires:	dbus-python
-BuildRequires:	pygobject2
+BuildRequires:  python-twisted
+BuildRequires:  dbus-python
+BuildRequires:  pygobject2
 %endif
 
 Requires:       telepathy-mission-control >= 5.5.0
@@ -48,6 +49,7 @@ chats and voice calls.
 %prep
 %setup -q
 %patch1 -p 1 -b .build
+%patch2 -p 1 -b .shebang
 
 
 %if %{run_tests}
@@ -98,6 +100,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/*.html
 
 
 %changelog
+* Tue Nov  5 2013 Debarshi Ray <rishi at fedoraproject.org> - 0.18.1-2
+- Explicitly state python in the shebang
+
 * Fri Sep  6 2013 Brian Pepple <bpepple at fedoraproject.org> - 0.18.1-1
 - Update to 0.18.1.
 


More information about the scm-commits mailing list