pool/NetworkManager-strongswan
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 311401 from home:dimstar:branches:GNOME:Factory

Browse Source 
- 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
This commit is contained in:
Bjørn Lie 2015-06-10 10:57:48 +00:00 committed by Git OBS Bridge
parent bc993db4af
commit 4205bd65b7
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NetworkManager-strongswan.changes
View File

@ -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 Fri Apr 25 09:09:01 UTC 2014 - dimstar@opensuse.org

11
NetworkManager-strongswan.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package NetworkManager-strongswan # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -38,11 +38,7 @@ BuildRequires: pkgconfig(libnm-glib-vpn)
BuildRequires: pkgconfig(libnm-util) BuildRequires: pkgconfig(libnm-util)
Requires: %{name}-frontend Requires: %{name}-frontend
Requires: NetworkManager >= 0.9.0 Requires: NetworkManager >= 0.9.0
%if 0%{?suse_version} <= 1220
Requires: strongswan >= 4.1.13
%else
Requires: strongswan-nm >= 5.0.1 Requires: strongswan-nm >= 5.0.1
%endif
Recommends: %{name}-lang Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
@ -79,11 +75,6 @@ cp %{SOURCE1} README.SUSE
%find_lang %{name} %{?no_lang_C} %find_lang %{name} %{?no_lang_C}
find %{buildroot}%{_libdir} -name '*.la' -delete -print 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 %clean
rm -rf %{buildroot} rm -rf %{buildroot}