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 c683e7c..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
@@ -134,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"
@@ -245,20 +242,20 @@ systemctl daemon-reload
 %attr(500,network_fw,network_fw) %{_bindir}/connmanctl
 %attr(755,network_fw,network_fw) /%{_localstatedir}/lib/connman
 %attr(600,network_fw,network_fw) /%{_localstatedir}/lib/connman/settings
-%attr(644,network_fw,network_fw) %{_datadir}/dbus-1/system-services/net.connman.service
+%attr(644,root,root) %{_datadir}/dbus-1/system-services/net.connman.service
 %{_sysconfdir}/dbus-1/system.d/*
 %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf
 %{_sysconfdir}/dbus-1/system.d/*.conf
-%attr(644,network_fw,network_fw) %{_libdir}/systemd/system/connman.service
-%attr(644,network_fw,network_fw) %{_libdir}/systemd/system/multi-user.target.wants/connman.service
+%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,network_fw,network_fw) %{_unitdir}/connman.service
-%attr(644,network_fw,network_fw) %{_unitdir}/multi-user.target.wants/connman.service
-%attr(644,network_fw,network_fw) %{_unitdir}/connman.socket
-%attr(644,network_fw,network_fw) %{_unitdir}/sockets.target.wants/connman.socket
+%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,network_fw,network_fw) %{_libdir}/systemd/system/connman.socket
-%attr(644,network_fw,network_fw) %{_libdir}/systemd/system/sockets.target.wants/connman.socket
+%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}
@@ -306,9 +303,9 @@ systemctl daemon-reload
 %config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
 %{_datadir}/dbus-1/system-services/net.connman.vpn.service
 %license COPYING
-%attr(644,network_fw,network_fw) %{_libdir}/systemd/system/connman-vpn.service
+%attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service
 %if "%{?_lib}" == "lib64"
-%attr(644,network_fw,network_fw) %{_unitdir}/connman-vpn.service
+%attr(644,root,root) %{_unitdir}/connman-vpn.service
 %endif
 %endif
 
@@ -319,9 +316,9 @@ mv -f %{_sysconfdir}/connman/main.conf.tv %{_sysconfdir}/connman/main.conf
 %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf.tv
 %license COPYING
 %if "%{?_lib}" == "lib64"
-%attr(644,network_fw,network_fw) %{_unitdir}/connman.service.tv
+%attr(644,root,root) %{_unitdir}/connman.service.tv
 %else
-%attr(644,network_fw,network_fw) %{_libdir}/systemd/system/connman.service.tv
+%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