Merge branch 'ipsec' into tizen

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

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 6cf5b37..f9a90f6 100755 (executable)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -5,7 +5,7 @@
 
 Name:           connman
 Version:        1.29
-Release:        20
+Release:        21
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
@@ -219,10 +219,6 @@ 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/
 
-#License
-mkdir -p %{buildroot}%{_datadir}/license
-cp COPYING %{buildroot}%{_datadir}/license/connman
-
 %if %{with connman_vpnd}
 cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
 %endif
@@ -266,7 +262,7 @@ systemctl daemon-reload
 %attr(644,root,root) %{_libdir}/systemd/system/connman.socket
 %attr(644,root,root) %{_libdir}/systemd/system/sockets.target.wants/connman.socket
 %endif
-%{_datadir}/license/connman
+%license COPYING
 %{upgrade_script_path}/%{upgrade_script_filename}
 
 %files test
@@ -284,6 +280,7 @@ systemctl daemon-reload
 %{_libdir}/connman/plugins-vpn/openconnect.so
 %{_libdir}/connman/scripts/openconnect-script
 %{_datadir}/dbus-1/system-services/net.connman.vpn.service
+%license COPYING
 %endif
 
 %if %{with connman_openvpn}
@@ -292,6 +289,7 @@ systemctl daemon-reload
 %{_libdir}/%{name}/plugins-vpn/openvpn.so
 %{_libdir}/%{name}/scripts/openvpn-script
 %{_datadir}/dbus-1/system-services/net.connman.vpn.service
+%license COPYING
 %endif
 
 %if %{with connman_ipsec}
@@ -311,6 +309,7 @@ systemctl daemon-reload
 %dir %{_libdir}/%{name}/plugins-vpn
 %config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf
 %{_datadir}/dbus-1/system-services/net.connman.vpn.service
+%license COPYING
 %endif
 
 %post extension-tv
@@ -318,6 +317,7 @@ mv -f %{_libdir}/systemd/system/connman.service.tv %{_libdir}/systemd/system/con
 mv -f %{_sysconfdir}/connman/main.conf.tv %{_sysconfdir}/connman/main.conf
 %files extension-tv
 %attr(644,root,root) %{_sysconfdir}/connman/main.conf.tv
+%license COPYING
 %if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/connman.service.tv
 %else
@@ -327,3 +327,5 @@ mv -f %{_sysconfdir}/connman/main.conf.tv %{_sysconfdir}/connman/main.conf
 mv -f %{_sysconfdir}/connman/main.conf.ivi %{_sysconfdir}/connman/main.conf
 %files extension-ivi
 %attr(644,root,root) %{_sysconfdir}/connman/main.conf.ivi
+%license COPYING
+