[NetworkManager-openconnect/f15] Look for openconnect in /usr/sbin too
David Woodhouse
dwmw2 at fedoraproject.org
Tue Nov 8 02:44:56 UTC 2011
commit a743ce217785ede2470b5cad26fe06ddcb57cb63
Author: David Woodhouse <David.Woodhouse at intel.com>
Date: Tue Nov 8 02:40:10 2011 +0000
Look for openconnect in /usr/sbin too
...ok-for-openconnect-binary-in-usr-sbin-too.patch | 29 ++++++++++++++++++++
NetworkManager-openconnect.spec | 7 ++++-
2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-Look-for-openconnect-binary-in-usr-sbin-too.patch b/0001-Look-for-openconnect-binary-in-usr-sbin-too.patch
new file mode 100644
index 0000000..2e12675
--- /dev/null
+++ b/0001-Look-for-openconnect-binary-in-usr-sbin-too.patch
@@ -0,0 +1,29 @@
+From 04411c56d511498f613bf2b68caac047a9a55195 Mon Sep 17 00:00:00 2001
+From: David Woodhouse <David.Woodhouse at intel.com>
+Date: Fri, 30 Sep 2011 12:35:45 +0100
+Subject: [PATCH] Look for openconnect binary in /usr/sbin too.
+
+The hard-coded paths here are weird. Why not use AM_PATH_PROG or even $prefix
+---
+ src/nm-openconnect-service.c | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/nm-openconnect-service.c b/src/nm-openconnect-service.c
+index d20b010..a5d95ce 100644
+--- a/src/nm-openconnect-service.c
++++ b/src/nm-openconnect-service.c
+@@ -57,8 +57,11 @@ typedef struct {
+ static const char *openconnect_binary_paths[] =
+ {
+ "/usr/bin/openconnect",
++ "/usr/sbin/openconnect",
+ "/usr/local/bin/openconnect",
++ "/usr/local/sbin/openconnect",
+ "/opt/bin/openconnect",
++ "/opt/sbin/openconnect",
+ NULL
+ };
+
+--
+1.7.7
+
diff --git a/NetworkManager-openconnect.spec b/NetworkManager-openconnect.spec
index b7c6393..e418e54 100644
--- a/NetworkManager-openconnect.spec
+++ b/NetworkManager-openconnect.spec
@@ -9,11 +9,12 @@
Summary: NetworkManager VPN integration for openconnect
Name: NetworkManager-openconnect
Version: 0.9.0
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
License: GPLv2+, LGPLv2.1
Group: System Environment/Base
URL: http://www.gnome.org/projects/NetworkManager/
Source: %{name}-%{realversion}%{snapshot}.tar.bz2
+Patch0: 0001-Look-for-openconnect-binary-in-usr-sbin-too.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -44,6 +45,7 @@ with NetworkManager and the GNOME desktop
%prep
%setup -q -n NetworkManager-openconnect-%{realversion}
+%patch0 -p1
%build
autoreconf
@@ -100,6 +102,9 @@ fi
%{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.ui
%changelog
+* Tue Nov 08 2011 David Woodhouse <David.Woodhouse at intel.com> - 0.9.0-3
+- Look for openconnect in /usr/sbin too
+
* Thu Sep 08 2011 David Woodhouse <David.Woodhouse at intel.com> - 0.9.0-2
- Use shared libopenconnect (#733431)
More information about the scm-commits
mailing list