X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fconnman.spec;h=80309a88ae72ba6701f18eecb1ac2d4755b82c38;hb=da1841ff3ac245489afa6376179d701bb8563e4f;hp=4a6815e51f3d2f1001aaa82a32c5f391512e398a;hpb=0565506882e72b1292c20d5717aabd0407dfe20f;p=platform%2Fupstream%2Fconnman.git

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 4a6815e..80309a8 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -1,17 +1,19 @@
 %bcond_with     connman_openconnect
+%bcond_with     connman_wireguard
 %bcond_without  connman_openvpn
 %bcond_without  connman_ipsec
 %bcond_without  connman_vpnd
 
 Name:           connman
-Version:        1.37
-Release:        41
+Version:        1.38
+Release:        3
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
 Group:          Network & Connectivity/Connection Management
 Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  systemd-devel
+BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -20,7 +22,7 @@ BuildRequires:  pkgconfig(xtables)
 BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(libnl-3.0)
 BuildRequires:  pkgconfig(libnl-genl-3.0)
-BuildRequires:  pkgconfig(libsystemd-daemon)
+BuildRequires:  pkgconfig(libsystemd)
 %if %{with connman_openconnect}
 BuildRequires:  openconnect
 %endif
@@ -87,6 +89,16 @@ Requires:       %{name} = %{version}
 Provides VPN support for Connman
 %endif
 
+%if %{with connman_wireguard}
+%package plugin-wireguard
+Summary:        Wireguard Support for Connman
+BuildRequires:  pkgconfig(libmnl)
+Requires:       %{name} = %{version}
+
+%description plugin-wireguard
+Wireguard Support for Connman.
+%endif
+
 %package test
 Summary:        Test Scripts for Connection Manager
 Group:          Development/Tools
@@ -163,6 +175,9 @@ chmod +x bootstrap
 %if %{with connman_ipsec}
             --enable-ipsec \
 %endif
+%if %{without connman_wireguard}
+            --disable-wireguard \
+%endif
 %if 0%{?enable_connman_features}
             %connman_features \
 %endif
@@ -171,7 +186,7 @@ chmod +x bootstrap
             --enable-test \
 	    --enable-loopback \
 	    --enable-ethernet \
-	    --with-systemdunitdir=%{_libdir}/systemd/system \
+	    --with-systemdunitdir=%{_unitdir} \
 	    --enable-pie \
 	    --disable-wispr \
 	    --disable-backtrace \
@@ -183,36 +198,19 @@ make %{?_smp_mflags}
 %make_install
 
 #Systemd service file
-mkdir -p %{buildroot}%{_libdir}/systemd/system/
-%if "%{?_lib}" == "lib64"
 mkdir -p %{buildroot}%{_unitdir}
-%endif
 
-%if "%{?_lib}" == "lib64"
 cp src/connman_tv.service %{buildroot}%{_unitdir}/connman.service.tv
 cp src/connman.service %{buildroot}%{_unitdir}/connman.service
 cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service
-%else
-cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service.tv
-%endif
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-ln -s ../connman.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/connman.service
-%if "%{?_lib}" == "lib64"
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 ln -s ../connman.service %{buildroot}%{_unitdir}/multi-user.target.wants/connman.service
-%endif
 
 #Systemd socket file for DNS proxy
-%if "%{?_lib}" == "lib64"
 cp src/connman.socket %{buildroot}%{_unitdir}/connman.socket
 mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
 ln -s ../connman.socket %{buildroot}%{_unitdir}/sockets.target.wants/connman.socket
-%else
-cp src/connman.socket %{buildroot}%{_libdir}/systemd/system/connman.socket
-mkdir -p %{buildroot}%{_libdir}/systemd/system/sockets.target.wants
-ln -s ../connman.socket %{buildroot}%{_libdir}/systemd/system/sockets.target.wants/connman.socket
-%endif
 
 mkdir -p %{buildroot}/%{_localstatedir}/lib/connman
 cp resources/var/lib/connman/settings %{buildroot}/%{_localstatedir}/lib/connman/settings
@@ -254,17 +252,10 @@ systemctl daemon-reload
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*
 %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*.conf
-%attr(644,root,root) %{_libdir}/systemd/system/connman.service
-%attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman.service
-%if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/connman.service
 %attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman.service
 %attr(644,root,root) %{_unitdir}/connman.socket
 %attr(644,root,root) %{_unitdir}/sockets.target.wants/connman.socket
-%else
-%attr(644,root,root) %{_libdir}/systemd/system/connman.socket
-%attr(644,root,root) %{_libdir}/systemd/system/sockets.target.wants/connman.socket
-%endif
 %license COPYING
 
 %files test
@@ -310,23 +301,23 @@ systemctl daemon-reload
 %attr(644,root,root) %config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
 %{_datadir}/dbus-1/system-services/net.connman.vpn.service
 %license COPYING
-%attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service
-%if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/connman-vpn.service
 %endif
+
+%if %{with connman_wireguard}
+%files plugin-wireguard
+%manifest %{name}.manifest
+%{_libdir}/%{name}/plugins-vpn/wireguard.so
+%license COPYING
 %endif
 
 %post extension-tv
-mv -f %{_libdir}/systemd/system/connman.service.tv %{_libdir}/systemd/system/connman.service
+mv -f %{_unitdir}/connman.service.tv %{_unitdir}/connman.service
 mv -f %{_sysconfdir}/connman/main.conf.tv %{_sysconfdir}/connman/main.conf
 %files extension-tv
 %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf.tv
 %license COPYING
-%if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/connman.service.tv
-%else
-%attr(644,root,root) %{_libdir}/systemd/system/connman.service.tv
-%endif
 %post extension-ivi
 mv -f %{_sysconfdir}/connman/main.conf.ivi %{_sysconfdir}/connman/main.conf
 %files extension-ivi