commit 87eca3d0a45b79d56b7e3ccde98d42eaf85ce1e1
Author: Elan Ruusamäe <[email protected]>
Date: Sat Jul 22 15:00:11 2017 +0300
use existing path for chroot
NetworkManager-openvpn.spec | 6 ++++--
chroot.patch | 10 ++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 2dfe00e..69b4883 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -2,11 +2,12 @@ Summary: NetworkManager VPN integration for OpenVPN
Summary(pl.UTF-8): Integracja NetworkManagera z OpenVPN-em
Name: NetworkManager-openvpn
Version: 1.2.10
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz
# Source0-md5: f118226ed2bfbacfd64ac4d1e0bd0383
+Patch0: chroot.patch
URL: https://wiki.gnome.org/Projects/NetworkManager
BuildRequires: NetworkManager-devel >= 2:1.2.0
BuildRequires: NetworkManager-gtk-lib-devel >= 1.2.0
@@ -44,6 +45,7 @@ Integracja NetworkManagera z OpenVPN-em.
%prep
%setup -q
+%patch0 -p1
%build
%{__intltoolize}
@@ -90,6 +92,6 @@ fi
%attr(755,root,root) %{_libdir}/nm-openvpn-service-openvpn-helper
%{_prefix}/lib/NetworkManager/VPN/nm-openvpn-service.name
%{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf
+%config(noreplace) %verify(not md5 mtime size)
/etc/dbus-1/system.d/nm-openvpn-service.conf
%{_datadir}/appdata/network-manager-openvpn.metainfo.xml
%{_datadir}/gnome-vpn-properties/openvpn
diff --git a/chroot.patch b/chroot.patch
new file mode 100644
index 0000000..7e5c746
--- /dev/null
+++ b/chroot.patch
@@ -0,0 +1,10 @@
+--- NetworkManager-openvpn-1.2.10/shared/nm-service-defines.h~ 2017-05-16
20:29:15.000000000 +0300
++++ NetworkManager-openvpn-1.2.10/shared/nm-service-defines.h 2017-07-22
14:59:32.246576023 +0300
+@@ -113,6 +113,6 @@
+ /* User name and group to run nm-openvpn-service under */
+ #define NM_OPENVPN_USER "nm-openvpn"
+ #define NM_OPENVPN_GROUP "nm-openvpn"
+-#define NM_OPENVPN_CHROOT LOCALSTATEDIR "/lib/openvpn/chroot"
++#define NM_OPENVPN_CHROOT "/usr/share/empty"
+
+ #endif /* __NM_SERVICE_DEFINES_H__ */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager-openvpn.git/commitdiff/87eca3d0a45b79d56b7e3ccde98d42eaf85ce1e1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
