X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fconnman.spec;h=33b9ccfc7718de8fc844d451ea203e24aeaea88f;hb=5bf80017321e03103f588306d2888d22f3f67ffa;hp=c54b2bffb2609b5848ff9ab543f2de520f28a1e6;hpb=dfe721e9b055249518b3d2e97773605e236b617a;p=platform%2Fupstream%2Fconnman.git diff --git a/packaging/connman.spec b/packaging/connman.spec old mode 100755 new mode 100644 index c54b2bf..33b9ccf --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -4,20 +4,23 @@ %bcond_without connman_vpnd Name: connman -Version: 1.29 -Release: 24 +Version: 1.37 +Release: 50 License: GPL-2.0+ Summary: Connection Manager Url: http://connman.net Group: Network & Connectivity/Connection Management Source0: %{name}-%{version}.tar.gz BuildRequires: systemd-devel +BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(xtables) BuildRequires: pkgconfig(libsmack) +BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-genl-3.0) BuildRequires: pkgconfig(libsystemd-daemon) %if %{with connman_openconnect} BuildRequires: openconnect @@ -27,7 +30,6 @@ BuildRequires: openvpn %endif %if %{with connman_ipsec} BuildRequires: strongswan -BuildRequires: pkgconfig(openssl) %endif BuildRequires: readline-devel #%systemd_requires @@ -37,13 +39,11 @@ 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} -%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. @@ -73,7 +73,6 @@ OpenVPN support for Connman. Summary: IPsec Support for Connman Requires: %{name} = %{version} Requires: strongswan -BuildRequires: pkgconfig(openssl) %description plugin-ipsec OpenVPN support for Connman. @@ -113,6 +112,7 @@ Summary: Connman service script for TV profile Requires: %{name} = %{version}-%{release} Provides: %{name}-profile_tv = %{version}-%{release} Conflicts: %{name}-extension-ivi +Conflicts: %{name}-extension-disable-eth %description extension-tv Supplies Tizen TV profile systemd service scripts instead of the default one. This overwrites service script of %{name}. @@ -122,17 +122,25 @@ Summary: Connman configuration for IVI profile Requires: %{name} = %{version}-%{release} Provides: %{name}-profile_ivi = %{version}-%{release} Conflicts: %{name}-extension-tv +Conflicts: %{name}-extension-disable-eth %description extension-ivi Supplies Tizen IVI profile configuration instead of the default one. This overwrites conf file of %{name}. +%package extension-disable-eth +Summary: Connman configuration for testing which requires the ethernet to be disabled +Requires: %{name} = %{version}-%{release} +Conflicts: %{name}-extension-tv +Conflicts: %{name}-extension-ivi +%description extension-disable-eth +Connman without ethernet support +This overwrites conf file of %{name}. + %prep %setup -q %build -#CFLAGS+=" -DTIZEN_EXT -lsmack -Werror" - %if %{with connman_vpnd} VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror" %endif @@ -140,10 +148,12 @@ VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror" chmod +x bootstrap ./bootstrap %configure \ - --sysconfdir=/etc \ - --enable-client \ - --enable-tizen-ext \ - --enable-pacrunner \ + --sysconfdir=/etc \ + --enable-client \ + --enable-tizen-ext \ + --disable-tizen-ext-ins \ + --enable-tizen-ext-eap-on-ethernet \ + --enable-pacrunner \ --enable-wifi=builtin \ %if %{with connman_openconnect} --enable-openconnect \ @@ -160,11 +170,13 @@ chmod +x bootstrap --disable-ofono \ --enable-telephony=builtin \ --enable-test \ - --enable-loopback \ - --enable-ethernet \ - --with-systemdunitdir=%{_libdir}/systemd/system \ - --enable-pie \ - --disable-wispr + --enable-loopback \ + --enable-ethernet \ + --with-systemdunitdir=%{_unitdir} \ + --enable-pie \ + --disable-wispr \ + --disable-backtrace \ + --disable-tools make %{?_smp_mflags} @@ -172,36 +184,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 @@ -211,6 +206,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.conf %{buildroot}/etc/connman/main.conf rm %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf @@ -221,10 +217,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 @@ -243,22 +235,14 @@ systemctl daemon-reload %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 -%{_sysconfdir}/dbus-1/system.d/* +%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/* %attr(644,network_fw,network_fw) %{_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) %{_sysconfdir}/dbus-1/system.d/*.conf %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 @@ -300,29 +284,26 @@ systemctl daemon-reload %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/scripts %dir %{_libdir}/%{name}/plugins-vpn -%config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf +%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 %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