X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fconnman.spec;h=c97b261df538d893894e694047a2bdc8140f55a2;hb=refs%2Fheads%2Ftizen;hp=501c10ef39d2b52ce70fca6b06b1a69ded18e172;hpb=a424f79696a666ac27812d23af170552e760309d;p=platform%2Fupstream%2Fconnman.git

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 501c10e..c97b261 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -1,12 +1,12 @@
 %bcond_with     connman_openconnect
-%bcond_with     connman_wireguard
+%bcond_without  connman_wireguard
 %bcond_without  connman_openvpn
 %bcond_without  connman_ipsec
 %bcond_without  connman_vpnd
 
 Name:           connman
-Version:        1.38
-Release:        4
+Version:        1.41
+Release:        2
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
@@ -39,11 +39,11 @@ Requires:         systemd
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
-Requires:         net-config
 Requires:         security-config
 Provides:       %{name}-profile_common = %{version}-%{release}
 Provides:       %{name}-profile_mobile = %{version}-%{release}
 Provides:       %{name}-profile_wearable = %{version}-%{release}
+Provides:       %{name}-profile_robot = %{version}-%{release}
 
 %description
 Connection Manager provides a daemon for managing Internet connections
@@ -111,7 +111,7 @@ Requires:       python-xml
 Scripts for testing Connman and its functionality
 
 %package devel
-Summary:        Development Files for connman
+Summary:        Development files for connman
 Group:          Development/Tools
 Requires:       %{name} = %{version}
 
@@ -147,6 +147,18 @@ Conflicts:      %{name}-extension-ivi
 Connman without ethernet support
 This overwrites conf file of %{name}.
 
+%package profile_robot
+Summary:		connman extension for robot profile
+Requires:		%{name} = %{version}-%{release}
+%description profile_robot
+connman extension for Tizen robot profile
+
+%package isu
+Summary: connman ISU pacakge
+Group:   Network & Connectivity/Connection Management
+%description isu
+Configuration files to generate the ISU (Individual Service Upgrade) package
+
 %prep
 %setup -q
 
@@ -162,8 +174,7 @@ chmod +x bootstrap
 	    --sysconfdir=/etc \
 	    --enable-client \
 	    --enable-tizen-ext \
-	    --disable-tizen-ext-ins \
-            --enable-tizen-ext-eap-on-ethernet \
+	    --enable-tizen-ext-eap-on-ethernet \
 	    --enable-pacrunner \
             --enable-wifi=builtin \
 %if %{with connman_openconnect}
@@ -221,11 +232,13 @@ mkdir -p %{buildroot}/etc/connman
 cp src/main_ivi.conf %{buildroot}/etc/connman/main.conf.ivi
 cp src/main_tv.conf %{buildroot}/etc/connman/main.conf.tv
 cp src/main_disable_eth.conf %{buildroot}/etc/connman/main.conf.disable.eth
+cp src/main_robot.conf %{buildroot}/etc/connman/main.conf.robot
 cp src/main.conf %{buildroot}/etc/connman/main.conf
 
 rm %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d/
 cp src/connman.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/
+cp src/connman-robot.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/
 
 %if %{with connman_vpnd}
 cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
@@ -246,10 +259,10 @@ systemctl daemon-reload
 %manifest connman.manifest
 %attr(500,network_fw,network_fw) %{_bindir}/connmand
 %attr(500,network_fw,network_fw) %{_bindir}/connmanctl
-%attr(755,network_fw,network_fw) /%{_localstatedir}/lib/connman
 %attr(600,network_fw,network_fw) /%{_localstatedir}/lib/connman/settings
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/net.connman.service
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*
+%exclude %{_sysconfdir}/dbus-1/system.d/connman-robot.conf
 %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*.conf
 %attr(644,root,root) %{_unitdir}/connman.service
@@ -314,17 +327,35 @@ systemctl daemon-reload
 %post extension-tv
 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
 %attr(644,root,root) %{_unitdir}/connman.service.tv
+
 %post extension-ivi
 mv -f %{_sysconfdir}/connman/main.conf.ivi %{_sysconfdir}/connman/main.conf
+
 %files extension-ivi
 %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf.ivi
 %license COPYING
+
 %post extension-disable-eth
 mv -f %{_sysconfdir}/connman/main.conf.disable.eth %{_sysconfdir}/connman/main.conf
+
 %files extension-disable-eth
 %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf.disable.eth
 %license COPYING
+
+%post profile_robot
+mv %{_sysconfdir}/dbus-1/system.d/connman-robot.conf %{_sysconfdir}/dbus-1/system.d/connman.conf
+mv -f %{_sysconfdir}/connman/main.conf.robot %{_sysconfdir}/connman/main.conf
+
+%files profile_robot
+%manifest %{name}.manifest
+%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/connman-robot.conf
+%attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf.robot
+
+%files isu
+/etc/isu/connman/isu.cfg
+/etc/isu/connman/system-services/connman.service