Fixed handle leak while returning error from specific_scan()

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

diff --git a/packaging/connman.spec b/packaging/connman.spec
index b3111da..c54b2bf 100755 (executable)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -5,7 +5,7 @@
 
 Name:           connman
 Version:        1.29
-Release:        23
+Release:        24
 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
@@ -30,7 +29,6 @@ BuildRequires:  openvpn
 BuildRequires:  strongswan
 BuildRequires:  pkgconfig(openssl)
 %endif
-BuildRequires:  ca-certificates-devel
 BuildRequires:  readline-devel
 #%systemd_requires
 Requires:       iptables
@@ -43,6 +41,9 @@ 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.
@@ -131,7 +132,6 @@ This overwrites conf file of %{name}.
 
 %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"
@@ -221,6 +221,10 @@ 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
@@ -254,6 +258,7 @@ systemctl daemon-reload
 %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