pool/strongswan
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 102857 from home:a_jaeger:FactoryFix

Browse Source 
Only glib.h can be included, fix compilation.

OBS-URL: https://build.opensuse.org/request/show/102857
OBS-URL: https://build.opensuse.org/package/show/network:vpn/strongswan?expand=0&rev=38
This commit is contained in:
Marius Tomaschewski 2012-02-15 12:52:12 +00:00 committed by Git OBS Bridge
parent 7888e999a8
commit fbee949c81
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
strongswan-4.5.3-glib.patch Normal file
View File

@ -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 <glib/gtypes.h>
-#include <glib-object.h>
+#include <glib.h>
#include <nm-vpn-plugin.h>
#include "nm_creds.h"

5
strongswan.changes
View File

@ -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 Wed Dec 21 10:31:49 UTC 2011 - coolo@suse.com

6
strongswan.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package strongswan # 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 # 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
@ -15,6 +15,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: strongswan Name: strongswan
Version: 4.5.3 Version: 4.5.3
Release: 0 Release: 0
@ -41,6 +43,7 @@ Source3: %{name}-%{version}-rpmlintrc
Source4: README.SUSE Source4: README.SUSE
Patch1: %{name}_modprobe_syslog.patch Patch1: %{name}_modprobe_syslog.patch
Patch2: %{name}-%{version}-fmt-warnings.patch Patch2: %{name}-%{version}-fmt-warnings.patch
Patch3: %{name}-%{version}-glib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison BuildRequires: bison
BuildRequires: curl-devel BuildRequires: curl-devel
@ -234,6 +237,7 @@ and the load testing plugin for IKEv2 daemon.
%setup -q -n %{name}-%{upstream_version} %setup -q -n %{name}-%{upstream_version}
%patch1 -p0 %patch1 -p0
%patch2 -p0 %patch2 -p0
%patch3 -p1
sed -e 's|@libexecdir@|%_libexecdir|g' \ sed -e 's|@libexecdir@|%_libexecdir|g' \
< $RPM_SOURCE_DIR/strongswan.init.in \ < $RPM_SOURCE_DIR/strongswan.init.in \
> strongswan.init > strongswan.init