From 4205bd65b71556dc8a1746e1215d046767468104de95cda2b00ba8f11e4e549e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Wed, 10 Jun 2015 10:57:48 +0000
Subject: [PATCH] Accepting request 311401 from
 home:dimstar:branches:GNOME:Factory

- Drop the sed hack to fix bnc#824079: since verson 1.3.1, the
  charon binary to be found is already called charon-nm by
  upstream (boo#934129).
- Clean out conditions for legacy openSUSE versions: we will always
  require strongswan > 5 as a consequence (which is correct, as
  that's when charon-nm was introduced).

OBS-URL: https://build.opensuse.org/request/show/311401
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/NetworkManager-strongswan?expand=0&rev=14
---
 NetworkManager-strongswan.changes | 10 ++++++++++
 NetworkManager-strongswan.spec    | 11 +----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/NetworkManager-strongswan.changes b/NetworkManager-strongswan.changes
index b497f2a..641b506 100644
--- a/NetworkManager-strongswan.changes
+++ b/NetworkManager-strongswan.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jun 10 07:56:56 UTC 2015 - dimstar@opensuse.org
+
+- Drop the sed hack to fix bnc#824079: since verson 1.3.1, the
+  charon binary to be found is already called charon-nm by
+  upstream (boo#934129).
+- Clean out conditions for legacy openSUSE versions: we will always
+  require strongswan > 5 as a consequence (which is correct, as
+  that's when charon-nm was introduced).
+
 -------------------------------------------------------------------
 Fri Apr 25 09:09:01 UTC 2014 - dimstar@opensuse.org
 
diff --git a/NetworkManager-strongswan.spec b/NetworkManager-strongswan.spec
index dd5515d..3ed8ec8 100644
--- a/NetworkManager-strongswan.spec
+++ b/NetworkManager-strongswan.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package NetworkManager-strongswan
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,11 +38,7 @@ BuildRequires:  pkgconfig(libnm-glib-vpn)
 BuildRequires:  pkgconfig(libnm-util)
 Requires:       %{name}-frontend
 Requires:       NetworkManager >= 0.9.0
-%if 0%{?suse_version} <= 1220
-Requires:       strongswan >= 4.1.13
-%else
 Requires:       strongswan-nm >= 5.0.1
-%endif
 Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExcludeArch:    s390 s390x
@@ -79,11 +75,6 @@ cp %{SOURCE1} README.SUSE
 %find_lang %{name} %{?no_lang_C}
 find %{buildroot}%{_libdir} -name '*.la' -delete -print
 
-# bnc#824079
-%if 0%{?suse_version} >= 1230
-sed -i "s/charon/charon-nm/" %{buildroot}%{_sysconfdir}/NetworkManager/VPN/nm-strongswan-service.name
-%endif
-
 %clean
 rm -rf %{buildroot}