pool/NetworkManager-strongswan
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

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

Browse Source 
- Add nm-strongswan-fix-config.patch: Fix path to NM plugins in
  config files (boo#944769).
- Add nm-strongswan-UI-fixup.patch: Fix broken UI (boo#944769).
- Add libtool BuildRequires and call to autoreconf, as above patch
  touches the build system.

OBS-URL: https://build.opensuse.org/request/show/330016
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/NetworkManager-strongswan?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger
2015-09-09 10:44:32 +00:00
committed by Git OBS Bridge
parent 4205bd65b7
commit 072d88de32
4 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
NetworkManager-strongswan.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Sep 8 06:14:23 UTC 2015 - dimstar@opensuse.org
- Add nm-strongswan-fix-config.patch: Fix path to NM plugins in
config files (boo#944769).
- Add nm-strongswan-UI-fixup.patch: Fix broken UI (boo#944769).
- Add libtool BuildRequires and call to autoreconf, as above patch
touches the build system.
-------------------------------------------------------------------
Wed Jun 10 07:56:56 UTC 2015 - dimstar@opensuse.org

10
NetworkManager-strongswan.spec
View File

@@ -27,7 +27,13 @@ Source0: http://download.strongswan.org/NetworkManager/%{name}-%{version}
Source1: README
# PATCH-FIX-UPSTREAM nm-strongswan-service-conf.patch binli@opensuse.org -- Dismiss the rpmlint warning for 'send_interface'
Patch0: nm-strongswan-service-conf.patch
# PATCH-FIX-UPSTREAM nm-strongswan-UI-fixup.patch boo#944769 dimstar@opensuse.org -- Fix broken UI
Patch1: nm-strongswan-UI-fixup.patch
# PATCH-FIX-UPSTREAM nm-strongswan-fix-config.patch boo#944769 dimstar@opensuse.org -- Fix path to NM plugins in config file
Patch2: nm-strongswan-fix-config.patch
BuildRequires: intltool
# Needed by patch2
BuildRequires: libtool
BuildRequires: pkgconfig(NetworkManager) >= 0.9.0
BuildRequires: pkgconfig(dbus-glib-1) >= 0.30
BuildRequires: pkgconfig(gnome-keyring-1)
@@ -62,9 +68,13 @@ strongSwan.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
cp %{SOURCE1} README.SUSE
%build
# Needed by patch2
autoreconf -fiv
%configure\
--disable-static \
--disable-more-warnings

22
nm-strongswan-UI-fixup.patch Normal file
View File

@@ -0,0 +1,22 @@
Index: NetworkManager-strongswan-1.3.1/properties/nm-strongswan-dialog.ui
===================================================================
--- NetworkManager-strongswan-1.3.1.orig/properties/nm-strongswan-dialog.ui
+++ NetworkManager-strongswan-1.3.1/properties/nm-strongswan-dialog.ui
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
- <object class="GtkWindow" id="strongswan-widget">
- <property name="can_focus">False</property>
- <property name="title" translatable="yes">window1</property>
- <child>
<object class="GtkVBox" id="strongswan-vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -374,6 +370,4 @@
</packing>
</child>
</object>
- </child>
- </object>
</interface>

22
nm-strongswan-fix-config.patch Normal file
View File

@@ -0,0 +1,22 @@
Index: NetworkManager-strongswan-1.3.1/nm-strongswan-service.name.in
===================================================================
--- NetworkManager-strongswan-1.3.1.orig/nm-strongswan-service.name.in
+++ NetworkManager-strongswan-1.3.1/nm-strongswan-service.name.in
@@ -5,4 +5,4 @@ program=@CHARON@
[GNOME]
auth-dialog=@LIBEXECDIR@/nm-strongswan-auth-dialog
-properties=libnm-strongswan-properties
+properties=@LIBDIR@/NetworkManager/libnm-strongswan-properties
Index: NetworkManager-strongswan-1.3.1/Makefile.am
===================================================================
--- NetworkManager-strongswan-1.3.1.orig/Makefile.am
+++ NetworkManager-strongswan-1.3.1/Makefile.am
@@ -13,6 +13,7 @@ nmvpnservice_DATA = nm-strongswan-servic
nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
$(AM_V_GEN) \
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \
+ -e 's![@]LIBDIR[@]!$(libdir)!' \
-e 's|[@]CHARON[@]|$(charon)|' $< >$@
EXTRA_DIST = nm-strongswan-service.name.in \