X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fconnman.spec;h=b571e59b211041ad2577f5ac9f33041f9bb331cc;hb=233bc85a5643c1316dbd915402265c88d06229f9;hp=3fbe789061db891e76e8c52e93a5eb5a449f227a;hpb=cdd2029ca7173fb2231f7cd0b8be8ef7503f4034;p=platform%2Fupstream%2Fconnman.git

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 3fbe789..b571e59 100755
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -3,8 +3,8 @@
 %bcond_without  connman_vpnd
 
 Name:           connman
-Version:        1.26
-Release:        7
+Version:        1.29
+Release:        15
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
@@ -15,9 +15,9 @@ BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libiptc)
 BuildRequires:  pkgconfig(xtables)
-BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(tpkp-gnutls)
+BuildRequires:  pkgconfig(libsystemd-daemon)
 %if %{with connman_openconnect}
 BuildRequires:  openconnect
 %endif
@@ -61,7 +61,7 @@ OpenVPN support for Connman.
 %if %{with connman_vpnd}
 %package connman-vpnd
 Summary:        VPN Support for Connman
-BuildRequires:  %{name} = %{version}
+#BuildRequires:  %{name} = %{version}
 Requires:       %{name} = %{version}
 
 %description connman-vpnd
@@ -93,7 +93,7 @@ Header files and development files for connman.
 
 %build
 CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
-CFLAGS+=" -DTIZEN_SYS_CA_BUNDLE=\"%TZ_SYS_CA_BUNDLE\""
+CFLAGS+=" -DTIZEN_SYS_CA_BUNDLE=\"%TZ_SYS_RO_CA_BUNDLE\""
 %if "%{profile}" == "tv"
 CFLAGS+=" -DTIZEN_TV_EXT"
 %endif
@@ -124,7 +124,8 @@ chmod +x bootstrap
 			--enable-loopback \
 			--enable-ethernet \
             --with-systemdunitdir=%{_libdir}/systemd/system \
-            --enable-pie
+            --enable-pie \
+			--disable-wispr
 
 make %{?_smp_mflags}
 
@@ -142,6 +143,7 @@ cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service
 %else
 %if "%{?_lib}" == "lib64"
 cp src/connman.service %{buildroot}%{_unitdir}/connman.service
+cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service
 %endif
 %endif
 
@@ -152,6 +154,17 @@ 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
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services
@@ -168,32 +181,14 @@ mkdir -p %{buildroot}%{_datadir}/license
 cp COPYING %{buildroot}%{_datadir}/license/connman
 
 %if %{with connman_vpnd}
-#Systemd service file
-%if "%{?_lib}" == "lib64"
-cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service
-%endif
-
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-ln -s ../connman-vpn.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/connman-vpn.service
-%if "%{?_lib}" == "lib64"
-mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-ln -s ../connman-vpn.service %{buildroot}%{_unitdir}/multi-user.target.wants/connman-vpn.service
-%endif
 cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
 %endif
 
 %post
-#systemctl daemon-reload
-#systemctl restart connman.service
-%if %{with connman_vpnd}
-systemctl restart connman-vpn.service
-%endif
+chsmack -a 'System' /%{_localstatedir}/lib/connman
+chsmack -a 'System' /%{_localstatedir}/lib/connman/settings
 
 %preun
-#systemctl stop connman.service
-%if %{with connman_vpnd}
-systemctl stop connman-vpn.service
-%endif
 
 %postun
 systemctl daemon-reload
@@ -214,12 +209,15 @@ systemctl daemon-reload
 %attr(644,root,root) %{_libdir}/systemd/system/connman.service
 %attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman.service
 %attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service
-%attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman-vpn.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-vpn.service
-%attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman-vpn.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
 %{_datadir}/license/connman
 
@@ -235,7 +233,6 @@ systemctl daemon-reload
 %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
@@ -244,7 +241,6 @@ systemctl daemon-reload
 %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
@@ -253,13 +249,7 @@ systemctl daemon-reload
 %if %{with connman_vpnd}
 %files connman-vpnd
 %manifest %{name}.manifest
-%{_sbindir}/connman-vpnd
-%attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service
-%attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman-vpn.service
-%if "%{?_lib}" == "lib64"
-%attr(644,root,root) %{_unitdir}/connman-vpn.service
-%attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman-vpn.service
-%endif
+#%{_sbindir}/connman-vpnd
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/scripts
 %dir %{_libdir}/%{name}/plugins-vpn