X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fconnman.spec;h=4a6815e51f3d2f1001aaa82a32c5f391512e398a;hb=1ca04d028034566c81abf7500c5cb45d2fc4ac11;hp=0554f9a7c997188b7ccc90a4affd19e0378b7926;hpb=30602f521a85820a9f6b7ac04876400e00c68b15;p=platform%2Fupstream%2Fconnman.git

diff --git a/packaging/connman.spec b/packaging/connman.spec
old mode 100755
new mode 100644
index 0554f9a..4a6815e
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -4,8 +4,8 @@
 %bcond_without  connman_vpnd
 
 Name:           connman
-Version:        1.35
-Release:        26
+Version:        1.37
+Release:        41
 License:        GPL-2.0+
 Summary:        Connection Manager
 Url:            http://connman.net
@@ -18,6 +18,8 @@ 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
@@ -41,9 +43,6 @@ 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.
@@ -141,8 +140,6 @@ This overwrites conf file of %{name}.
 
 
 %build
-#CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
-
 %if %{with connman_vpnd}
 VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
 %endif
@@ -150,10 +147,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 \
@@ -170,11 +169,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=%{_libdir}/systemd/system \
+	    --enable-pie \
+	    --disable-wispr \
+	    --disable-backtrace \
+	    --disable-tools
 
 make %{?_smp_mflags}
 
@@ -232,10 +233,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
@@ -254,9 +251,9 @@ 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) %{_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"
@@ -269,7 +266,6 @@ 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
@@ -311,7 +307,7 @@ 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