Updated connman to version 1.35

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

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 84f0ed7..0554f9a 100755 (executable)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -4,8 +4,8 @@
 %bcond_without  connman_vpnd
 
 Name:           connman
-Version:        1.29
-Release:        23
+Version:        1.35
+Release:        26
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
@@ -18,7 +18,6 @@ BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(libiptc)
 BuildRequires:  pkgconfig(xtables)
 BuildRequires:  pkgconfig(libsmack)
-BuildRequires:  pkgconfig(tpkp-gnutls)
 BuildRequires:  pkgconfig(libsystemd-daemon)
 %if %{with connman_openconnect}
 BuildRequires:  openconnect
@@ -28,9 +27,7 @@ BuildRequires:  openvpn
 %endif
 %if %{with connman_ipsec}
 BuildRequires:  strongswan
-BuildRequires:  pkgconfig(openssl)
 %endif
-BuildRequires:  ca-certificates-devel
 BuildRequires:  readline-devel
 #%systemd_requires
 Requires:       iptables
@@ -39,6 +36,7 @@ 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}
@@ -75,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.
@@ -115,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}.
@@ -124,17 +122,26 @@ 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"
-CFLAGS+=" -DTIZEN_SYS_CA_BUNDLE=\"%TZ_SYS_RO_CA_BUNDLE\""
 
 %if %{with connman_vpnd}
 VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
@@ -214,6 +221,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
@@ -328,4 +336,8 @@ 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