%bcond_with connman_openconnect
-%bcond_with connman_openvpn
-%bcond_with connman_vpnd
-%bcond_with connman_ntp
+%bcond_without connman_openvpn
+%bcond_without connman_vpnd
Name: connman
-Version: 1.26
-Release: 1
-License: GPL-2.0
+Version: 1.29
+Release: 12
+License: GPL-2.0+
Summary: Connection Manager
Url: http://connman.net
Group: Network & Connectivity/Connection Management
Source0: %{name}-%{version}.tar.gz
-Source10: 40-connman-ntp.list
-Source11: connman-ntp.service
-Source1001: connman.manifest
-BuildRequires: systemd-devel
+BuildRequires: systemd-devel
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)
%if %{with connman_openconnect}
BuildRequires: openconnect
%endif
%if %{with connman_openvpn}
BuildRequires: openvpn
%endif
+BuildRequires: ca-certificates-devel
BuildRequires: readline-devel
-%systemd_requires
+#%systemd_requires
Requires: iptables
+Requires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+Requires: net-config
%description
Connection Manager provides a daemon for managing Internet connections
%if %{with connman_vpnd}
%package connman-vpnd
Summary: VPN Support for Connman
-BuildRequires: %{name} = %{version}
+#BuildRequires: %{name} = %{version}
Requires: %{name} = %{version}
%description connman-vpnd
%package test
Summary: Test Scripts for Connection Manager
+Group: Development/Tools
Requires: %{name} = %{version}
Requires: dbus-python
Requires: pygobject
%package devel
Summary: Development Files for connman
+Group: Development/Tools
Requires: %{name} = %{version}
%description devel
%prep
%setup -q
-cp %{SOURCE1001} .
+
%build
-CFLAGS+=" -DTIZEN_EXT"
+CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
+CFLAGS+=" -DTIZEN_SYS_CA_BUNDLE=\"%TZ_SYS_RO_CA_BUNDLE\""
+%if "%{profile}" == "tv"
+CFLAGS+=" -DTIZEN_TV_EXT"
+%endif
+
+%if %{with connman_vpnd}
+VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
+%endif
chmod +x bootstrap
./bootstrap
%configure \
- --enable-threads \
+ --sysconfdir=/etc \
--enable-client \
--enable-pacrunner \
--enable-wifi=builtin \
%if %{with connman_openvpn}
--enable-openvpn \
%endif
+%if 0%{?enable_connman_features}
+ %connman_features \
+%endif
+ --disable-ofono \
+ --enable-telephony=builtin \
--enable-test \
- --enable-loopback \
- --enable-ethernet \
- --with-systemdunitdir=%{_unitdir}
+ --enable-loopback \
+ --enable-ethernet \
+ --with-systemdunitdir=%{_libdir}/systemd/system \
+ --enable-pie \
+ --disable-wispr
make %{?_smp_mflags}
%install
%make_install
-%if %{with connman_ntp}
-mkdir -p %{buildroot}/usr/lib/systemd/ntp-units.d
-install -m644 %{SOURCE10} %{buildroot}/usr/lib/systemd/ntp-units.d
-install -m644 %{SOURCE11} %{buildroot}%{_unitdir}
-%install_service network.target.wants connman-ntp.service
-%install_service multi-user.target.wants connman-ntp.service
+#Systemd service file
+mkdir -p %{buildroot}%{_libdir}/systemd/system/
+%if "%{?_lib}" == "lib64"
+mkdir -p %{buildroot}%{_unitdir}
+%endif
+
+%if "%{profile}" == "tv"
+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
+
+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
-mkdir -p %{buildroot}%{_sysconfdir}/connman
-cp src/main.conf %{buildroot}%{_sysconfdir}/connman/main.conf
+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
+cp resources/usr/share/dbus-1/system-services/net.connman.service %{buildroot}%{_datadir}/dbus-1/system-services/net.connman.service
+mkdir -p %{buildroot}/etc/connman
+cp src/main.conf %{buildroot}/etc/connman/main.conf
-%install_service network.target.wants connman.service
-%install_service multi-user.target.wants connman.service
+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/
+
+#License
+mkdir -p %{buildroot}%{_datadir}/license
+cp COPYING %{buildroot}%{_datadir}/license/connman
%if %{with connman_vpnd}
-%install_service network.target.wants connman-vpn.service
-%install_service multi-user.target.wants connman-vpn.service
+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
%preun
-systemctl stop connman.service
-%if %{with connman_vpnd}
-systemctl stop connman-vpn.service
-%endif
%postun
systemctl daemon-reload
%docs_package
%files
-%manifest %{name}.manifest
-%license COPYING
-%{_sbindir}/*
-%{_libdir}/connman/plugins/*.so
-%{_datadir}/man/*
-%config %{_sysconfdir}/connman/main.conf
-%config %{_sysconfdir}/dbus-1/system.d/*
-%{_unitdir}/connman.service
-%{_unitdir}/network.target.wants/connman.service
-%{_unitdir}/multi-user.target.wants/connman.service
-%if %{with connman_ntp}
-%dir /usr/lib/systemd/ntp-units.d
-%{_unitdir}/connman-ntp.service
-%{_unitdir}/multi-user.target.wants/connman-ntp.service
-%{_unitdir}/network.target.wants/connman-ntp.service
-/usr/lib/systemd/ntp-units.d/40-connman-ntp.list
+%manifest connman.manifest
+%attr(500,root,root) %{_sbindir}/*
+%attr(500,root,root) %{_bindir}/connmanctl
+%attr(600,root,root) /%{_localstatedir}/lib/connman/settings
+#%{_libdir}/connman/plugins/*.so
+%attr(644,root,root) %{_datadir}/dbus-1/system-services/*
+#%{_datadir}/dbus-1/services/*
+%{_sysconfdir}/dbus-1/system.d/*
+%attr(644,root,root) %{_sysconfdir}/connman/main.conf
+%{_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
+%attr(644,root,root) %{_libdir}/systemd/system/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
%endif
+%{_datadir}/license/connman
%files test
-%manifest %{name}.manifest
+%manifest connman.manifest
%{_libdir}/%{name}/test/*
%files devel
-%manifest %{name}.manifest
-%{_includedir}/connman/*.h
+%manifest connman.manifest
+%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%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
%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
%if %{with connman_vpnd}
%files connman-vpnd
%manifest %{name}.manifest
-%{_sbindir}/connman-vpnd
-%{_unitdir}/connman-vpn.service
-%{_unitdir}/network.target.wants/connman-vpn.service
-%{_unitdir}/multi-user.target.wants/connman-vpn.service
+#%{_sbindir}/connman-vpnd
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/scripts
%dir %{_libdir}/%{name}/plugins-vpn
%{_datadir}/dbus-1/system-services/net.connman.vpn.service
%endif
-%changelog
+