X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fconnman.spec;h=ba2c24c79e993e7b22f4aecec044ee8beff0e4c4;hb=00b8c314dc2cfb641494d413f4b00d90a10ecbeb;hp=3cb5a8f44a1d9b08bd6b1a7ee77f9f8c88957092;hpb=d4fbe50ed65c256d0592cd61496eda3e0bac5389;p=platform%2Fupstream%2Fconnman.git

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 3cb5a8f..ba2c24c 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -5,8 +5,8 @@
 %bcond_without  connman_vpnd
 
 Name:           connman
-Version:        1.38
-Release:        10
+Version:        1.40
+Release:        2
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
@@ -147,22 +147,6 @@ Conflicts:      %{name}-extension-ivi
 Connman without ethernet support
 This overwrites conf file of %{name}.
 
-%package extension-bpf
-Summary:        Files for BPF support
-Requires:       libelf
-Requires:       zlib
-Requires:       %{name} = %{version}-%{release}
-%description extension-bpf
-Files for BPF support
-
-%package extension-bpf-devel
-License:        GPL-2.0+ and LGPL-2.1+
-Summary:        Development files for BPF support
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-extension-bpf
-%description extension-bpf-devel
-Header files and development files for BPF support
-
 %package profile_robot
 Summary:		connman extension for robot profile
 Requires:		%{name} = %{version}-%{release}
@@ -243,6 +227,7 @@ 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
@@ -254,17 +239,6 @@ cp src/connman-robot.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/
 cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
 %endif
 
-# BPF file
-mkdir -p %{buildroot}/%{_includedir}/bpf
-cp -rf resources/usr/include/bpf/* %{buildroot}/%{_includedir}/bpf
-cp resources/var/lib/connman/bpf_code %{buildroot}/%{_localstatedir}/lib/connman/bpf_code
-
-%ifarch aarch64
-cp resources/usr/lib/libbpf.so.64 %{buildroot}/%{_libdir}/libbpf.so.0.2.0
-%else
-cp resources/usr/lib/libbpf.so.32 %{buildroot}/%{_libdir}/libbpf.so.0.2.0
-%endif
-
 %post
 #chsmack -a 'System' /%{_localstatedir}/lib/connman
 #chsmack -a 'System' /%{_localstatedir}/lib/connman/settings
@@ -368,24 +342,11 @@ mv -f %{_sysconfdir}/connman/main.conf.disable.eth %{_sysconfdir}/connman/main.c
 %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf.disable.eth
 %license COPYING
 
-%files extension-bpf
-%manifest %{name}.manifest
-%attr(755,root,root) %{_libdir}/libbpf.so.0.2.0
-%attr(640,network_fw,network_fw) %{_localstatedir}/lib/connman/bpf_code
-
-%post extension-bpf
-ln -s %{_libdir}/libbpf.so.0.2.0 %{_libdir}/libbpf.so.0
-ln -s %{_libdir}/libbpf.so.0.2.0 %{_libdir}/libbpf.so
-
-%files extension-bpf-devel
-%manifest %{name}.manifest
-%{_includedir}/bpf/*
-%license COPYING
-%license COPYING.LGPLv2
-
 %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