Hello community,
here is the log from the commit of package NetworkManager-strongswan for
openSUSE:Factory checked in at 2015-09-09 20:21:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-strongswan (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-strongswan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-strongswan"
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-strongswan/NetworkManager-strongswan.changes
2015-06-11 08:23:06.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.NetworkManager-strongswan.new/NetworkManager-strongswan.changes
2015-09-09 20:21:23.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Sep 8 06:14:23 UTC 2015 - [email protected]
+
+- 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.
+
+-------------------------------------------------------------------
New:
----
nm-strongswan-UI-fixup.patch
nm-strongswan-fix-config.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-strongswan.spec ++++++
--- /var/tmp/diff_new_pack.jJZ6uG/_old 2015-09-09 20:21:23.000000000 +0200
+++ /var/tmp/diff_new_pack.jJZ6uG/_new 2015-09-09 20:21:23.000000000 +0200
@@ -27,7 +27,13 @@
Source1: README
# PATCH-FIX-UPSTREAM nm-strongswan-service-conf.patch [email protected] --
Dismiss the rpmlint warning for 'send_interface'
Patch0: nm-strongswan-service-conf.patch
+# PATCH-FIX-UPSTREAM nm-strongswan-UI-fixup.patch boo#944769
[email protected] -- Fix broken UI
+Patch1: nm-strongswan-UI-fixup.patch
+# PATCH-FIX-UPSTREAM nm-strongswan-fix-config.patch boo#944769
[email protected] -- 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 @@
%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
++++++ nm-strongswan-UI-fixup.patch ++++++
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>
++++++ nm-strongswan-fix-config.patch ++++++
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 \
