Accepting request 186980 from GNOME:Factory

fix bnc#824079: "program" in nm-strongswan-service.name points to a wrong binary (forwarded request 180921 from MargueriteSu)

OBS-URL: https://build.opensuse.org/request/show/186980
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/NetworkManager-strongswan?expand=0&rev=7

NetworkManager-strongswan.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 10 08:57:49 UTC 2013 - i@marguerite.su
+
+- fix bnc#824079: "program" in nm-strongswan-service.name points 
+  to a wrong binary
+
 -------------------------------------------------------------------
 Fri Mar  1 12:42:21 UTC 2013 - dimstar@opensuse.org
 

NetworkManager-strongswan.spec

@@ -38,7 +38,11 @@ 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
@@ -74,6 +78,11 @@ 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}