From 1d65d069c2a1e0b414a5139fe4cd3b421a056702 Mon Sep 17 00:00:00 2001 From: Zhang zhengguang Date: Fri, 4 Jul 2014 14:37:58 +0800 Subject: Enable ConnMan VPND/OpenVPN/OpenConnect configurable in spec file --- packaging/connman.spec | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/packaging/connman.spec b/packaging/connman.spec index e8bfdad6..11b0869c 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -1,3 +1,6 @@ +%bcond_with connman_openconnect +%bcond_with connman_openvpn +%bcond_with connman_vpnd %bcond_with connman_ntp Name: connman @@ -17,6 +20,12 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(xtables) BuildRequires: pkgconfig(gnutls) +%if %{with connman_openconnect} +BuildRequires: openconnect +%endif +%if %{with connman_openvpn} +BuildRequires: openvpn +%endif BuildRequires: readline-devel %systemd_requires Requires: iptables @@ -25,6 +34,36 @@ Requires: iptables Connection Manager provides a daemon for managing Internet connections within embedded devices running the Linux operating system. +%if %{with connman_openconnect} +%package plugin-openconnect +Summary: Openconnect Support for Connman +Requires: %{name} = %{version} +Requires: openconnect + +%description plugin-openconnect +Openconnect Support for Connman. +%endif + +%if %{with connman_openvpn} +%package plugin-openvpn +Summary: Openvpn Support for Connman +Requires: %{name} = %{version} +Requires: openvpn + +%description plugin-openvpn +OpenVPN support for Connman. +%endif + +%if %{with connman_vpnd} +%package connman-vpnd +Summary: VPN Support for Connman +BuildRequires: %{name} = %{version} +Requires: %{name} = %{version} + +%description connman-vpnd +Provides VPN support for Connman +%endif + %package test Summary: Test Scripts for Connection Manager Requires: %{name} = %{version} @@ -56,6 +95,12 @@ chmod +x bootstrap --enable-client \ --enable-pacrunner \ --enable-wifi=builtin \ +%if %{with connman_openconnect} + --enable-openconnect \ +%endif +%if %{with connman_openvpn} + --enable-openvpn \ +%endif --enable-test \ --enable-loopback \ --enable-ethernet \ @@ -80,12 +125,23 @@ cp src/main.conf %{buildroot}%{_sysconfdir}/connman/main.conf %install_service network.target.wants connman.service %install_service multi-user.target.wants connman.service +%if %{with connman_vpnd} +%install_service network.target.wants connman-vpn.service +%install_service multi-user.target.wants connman-vpn.service +%endif + %post systemctl daemon-reload systemctl restart connman.service +%if %{with connman_vpnd} +systemctl restart connman-vpn.service +%endif %preun systemctl stop connman.service +%if %{with connman_vpnd} +systemctl stop connman-vpn.service +%endif %postun systemctl daemon-reload @@ -118,4 +174,36 @@ systemctl daemon-reload %{_includedir}/connman/*.h %{_libdir}/pkgconfig/*.pc +%if %{with connman_openconnect} +%files plugin-openconnect +%manifest %{name}.manifest +%{_unitdir}/connman-vpn.service +%{_libdir}/connman/plugins-vpn/openconnect.so +%{_libdir}/connman/scripts/openconnect-script +%{_datadir}/dbus-1/system-services/net.connman.vpn.service +%endif + +%if %{with connman_openvpn} +%files plugin-openvpn +%manifest %{name}.manifest +%{_unitdir}/connman-vpn.service +%{_libdir}/%{name}/plugins-vpn/openvpn.so +%{_libdir}/%{name}/scripts/openvpn-script +%{_datadir}/dbus-1/system-services/net.connman.vpn.service +%endif + +%if %{with connman_vpnd} +%files connman-vpnd +%manifest %{name}.manifest +%{_sbindir}/connman-vpnd +%{_unitdir}/connman-vpn.service +%{_unitdir}/network.target.wants/connman-vpn.service +%{_unitdir}/multi-user.target.wants/connman-vpn.service +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/scripts +%dir %{_libdir}/%{name}/plugins-vpn +%config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf +%{_datadir}/dbus-1/system-services/net.connman.vpn.service +%endif + %changelog -- cgit v1.2.3