From 6aa4055ef0544ae85457c25c510fe3db04949c43 Mon Sep 17 00:00:00 2001 From: hyunuktak Date: Fri, 7 Aug 2015 17:11:34 +0900 Subject: Base Code merged to SPIN 2.4 Signed-off-by: hyunuktak Change-Id: I84a42375b5c59739e4caca1f726699ea7647ef17 --- packaging/connman.spec | 202 ++++++++++++++++++------------------------------- 1 file changed, 72 insertions(+), 130 deletions(-) mode change 100644 => 100755 packaging/connman.spec (limited to 'packaging/connman.spec') diff --git a/packaging/connman.spec b/packaging/connman.spec old mode 100644 new mode 100755 index 6f1f636f..9f0f1f26 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -1,72 +1,33 @@ -%bcond_with connman_openconnect -%bcond_with connman_openvpn -%bcond_with connman_vpnd -%bcond_with connman_ntp - Name: connman -Version: 1.26 +Version: 1.29.24 Release: 1 -License: GPL-2.0 +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: pkgconfig(dbus-1) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(xtables) -BuildRequires: pkgconfig(libsmack) BuildRequires: pkgconfig(gnutls) -%if %{with connman_openconnect} -BuildRequires: openconnect -%endif -%if %{with connman_openvpn} -BuildRequires: openvpn -%endif +BuildRequires: pkgconfig(libsmack) BuildRequires: readline-devel %systemd_requires Requires: iptables +Requires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %description Connection Manager provides a daemon for managing Internet connections within embedded devices running the Linux operating system. -%if %{with connman_openconnect} -%package plugin-openconnect -Summary: Openconnect Support for Connman -Requires: %{name} = %{version} -Requires: openconnect - -%description plugin-openconnect -Openconnect Support for Connman. -%endif - -%if %{with connman_openvpn} -%package plugin-openvpn -Summary: Openvpn Support for Connman -Requires: %{name} = %{version} -Requires: openvpn - -%description plugin-openvpn -OpenVPN support for Connman. -%endif - -%if %{with connman_vpnd} -%package connman-vpnd -Summary: VPN Support for Connman -BuildRequires: %{name} = %{version} -Requires: %{name} = %{version} - -%description connman-vpnd -Provides VPN support for Connman -%endif %package test Summary: Test Scripts for Connection Manager +Group: Development/Tools Requires: %{name} = %{version} Requires: dbus-python Requires: pygobject @@ -77,6 +38,7 @@ Scripts for testing Connman and its functionality %package devel Summary: Development Files for connman +Group: Development/Tools Requires: %{name} = %{version} %description devel @@ -84,127 +46,107 @@ Header files and development files for connman. %prep %setup -q -cp %{SOURCE1001} . + %build +CFLAGS+=" -DTIZEN_EXT -lsmack -Werror" +%if "%{?tizen_profile_name}" == "tv" +CFLAGS+=" -DTIZEN_TV_EXT" +%endif chmod +x bootstrap ./bootstrap %configure \ - --enable-threads \ + --sysconfdir=/etc \ --enable-client \ - --enable-tizen-ext \ --enable-pacrunner \ --enable-wifi=builtin \ -%if %{with connman_openconnect} - --enable-openconnect \ -%endif -%if %{with connman_openvpn} - --enable-openvpn \ +%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 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 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 "%{?tizen_profile_name}" == "tv" +cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service +%else +cp src/connman.service %{buildroot}%{_libdir}/systemd/system/connman.service +%if "%{?_lib}" == "lib64" +cp src/connman.service %{buildroot}%{_unitdir}/connman.service +%endif %endif -mkdir -p %{buildroot}%{_localstatedir}/lib/connman -cp resources/var/lib/connman/settings %{buildroot}%{_localstatedir}/lib/connman/settings +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}/etc/connman +cp src/main.conf %{buildroot}/etc/connman/main.conf -%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/ -%if %{with connman_vpnd} -%install_service multi-user.target.wants connman-vpn.service -%endif +#License +mkdir -p %{buildroot}%{_datadir}/license +cp COPYING %{buildroot}%{_datadir}/license/connman %post -systemctl daemon-reload -systemctl restart connman.service -%if %{with connman_vpnd} -systemctl restart connman-vpn.service -%endif +#systemctl daemon-reload +#systemctl restart connman.service %preun -systemctl stop connman.service -%if %{with connman_vpnd} -systemctl stop connman-vpn.service -%endif +#systemctl stop connman.service %postun -systemctl daemon-reload +#systemctl daemon-reload %docs_package %files -%manifest %{name}.manifest -%license COPYING -%{_sbindir}/* -%{_libdir}/connman/plugins/*.so -%{_datadir}/man/* -%attr(600,root,root) %{_localstatedir}/lib/connman/settings -%config %{_sysconfdir}/connman/main.conf -%config %{_sysconfdir}/dbus-1/system.d/* -%{_unitdir}/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 -/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 +#%{_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 +%if "%{?_lib}" == "lib64" +%attr(644,root,root) %{_unitdir}/connman.service +%attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman.service %endif +%{_datadir}/license/connman %files test -%manifest %{name}.manifest %{_libdir}/%{name}/test/* %files devel -%manifest %{name}.manifest -%{_includedir}/connman/*.h +%{_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 -%endif - -%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 -%endif - -%if %{with connman_vpnd} -%files connman-vpnd -%manifest %{name}.manifest -%{_sbindir}/connman-vpnd -%{_unitdir}/connman-vpn.service -%{_unitdir}/multi-user.target.wants/connman-vpn.service -%dir %{_libdir}/%{name} -%dir %{_libdir}/%{name}/scripts -%dir %{_libdir}/%{name}/plugins-vpn -%config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf -%{_datadir}/dbus-1/system-services/net.connman.vpn.service -%endif -%changelog -- cgit v1.2.3