diff --git a/strongswan-4.5.3-glib.patch b/strongswan-4.5.3-glib.patch new file mode 100644 index 0000000..ad0629b --- /dev/null +++ b/strongswan-4.5.3-glib.patch @@ -0,0 +1,14 @@ +Index: strongswan-4.5.3/src/libcharon/plugins/nm/nm_service.h +=================================================================== +--- strongswan-4.5.3.orig/src/libcharon/plugins/nm/nm_service.h ++++ strongswan-4.5.3/src/libcharon/plugins/nm/nm_service.h +@@ -21,8 +21,7 @@ + #ifndef NM_SERVICE_H_ + #define NM_SERVICE_H_ + +-#include +-#include ++#include + #include + + #include "nm_creds.h" diff --git a/strongswan.changes b/strongswan.changes index 5eabc3e..9bc562a 100644 --- a/strongswan.changes +++ b/strongswan.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 6 10:27:00 UTC 2012 - aj@suse.de + +- Only glib.h can be included, fix compilation. + ------------------------------------------------------------------- Wed Dec 21 10:31:49 UTC 2011 - coolo@suse.com diff --git a/strongswan.spec b/strongswan.spec index 8c7e923..327cfb5 100644 --- a/strongswan.spec +++ b/strongswan.spec @@ -1,7 +1,7 @@ # # spec file for package strongswan # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: strongswan Version: 4.5.3 Release: 0 @@ -41,6 +43,7 @@ Source3: %{name}-%{version}-rpmlintrc Source4: README.SUSE Patch1: %{name}_modprobe_syslog.patch Patch2: %{name}-%{version}-fmt-warnings.patch +Patch3: %{name}-%{version}-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: curl-devel @@ -234,6 +237,7 @@ and the load testing plugin for IKEv2 daemon. %setup -q -n %{name}-%{upstream_version} %patch1 -p0 %patch2 -p0 +%patch3 -p1 sed -e 's|@libexecdir@|%_libexecdir|g' \ < $RPM_SOURCE_DIR/strongswan.init.in \ > strongswan.init