Add support for handling multiple wifi interfaces

[platform/upstream/connman.git] / packaging / connman.spec

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 53d99bb..a8904e2 100644 (file)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -4,8 +4,8 @@
 %bcond_without  connman_vpnd
 
 Name:           connman
-Version:        1.35
-Release:        29
+Version:        1.37
+Release:        44
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
@@ -18,7 +18,8 @@ BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(libiptc)
 BuildRequires:  pkgconfig(xtables)
 BuildRequires:  pkgconfig(libsmack)
-BuildRequires:  pkgconfig(libnl-2.0)
+BuildRequires:  pkgconfig(libnl-3.0)
+BuildRequires:  pkgconfig(libnl-genl-3.0)
 BuildRequires:  pkgconfig(libsystemd-daemon)
 %if %{with connman_openconnect}
 BuildRequires:  openconnect
@@ -42,9 +43,6 @@ Provides:       %{name}-profile_common = %{version}-%{release}
 Provides:       %{name}-profile_mobile = %{version}-%{release}
 Provides:       %{name}-profile_wearable = %{version}-%{release}
 
-%define upgrade_script_filename 500.connman_upgrade.sh
-%define upgrade_script_path /usr/share/upgrade/scripts
-
 %description
 Connection Manager provides a daemon for managing Internet connections
 within embedded devices running the Linux operating system.
@@ -149,10 +147,11 @@ VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
 chmod +x bootstrap
 ./bootstrap
 %configure \
-            --sysconfdir=/etc \
+           --sysconfdir=/etc \
            --enable-client \
            --enable-tizen-ext \
-           --enable-tizen-maintain-online \
+           --disable-tizen-ext-ins \
+            --enable-tizen-ext-eap-on-ethernet \
            --enable-pacrunner \
             --enable-wifi=builtin \
 %if %{with connman_openconnect}
@@ -172,9 +171,11 @@ chmod +x bootstrap
             --enable-test \
            --enable-loopback \
            --enable-ethernet \
-           --with-systemdunitdir=%{_libdir}/systemd/system \
+           --with-systemdunitdir=%{_unitdir} \
            --enable-pie \
-           --disable-wispr
+           --disable-wispr \
+           --disable-backtrace \
+           --disable-tools
 
 make %{?_smp_mflags}
 
@@ -182,36 +183,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
@@ -232,10 +216,6 @@ cp src/connman.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/
 cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
 %endif
 
-#OS Upgrade
-mkdir -p %{buildroot}%{upgrade_script_path}
-cp -f scripts/%{upgrade_script_filename} %{buildroot}%{upgrade_script_path}
-
 %post
 #chsmack -a 'System' /%{_localstatedir}/lib/connman
 #chsmack -a 'System' /%{_localstatedir}/lib/connman/settings
@@ -257,19 +237,11 @@ 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
-%{upgrade_script_path}/%{upgrade_script_filename}
 
 %files test
 %manifest connman.manifest
@@ -314,23 +286,16 @@ 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
-%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