Make ntp, openconnect configurable

Signed-off-by: Anas Nashif <anas.nashif@intel.com>

2 files changed, 24 insertions, 15 deletions

diff --git a/packaging/connman.changes b/packaging/connman.changes
index dc731968..079409e6 100644
--- a/packaging/connman.changes
+++ b/packaging/connman.changes
@@ -1,3 +1,6 @@
+* Thu Jul 04 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130701.201407@a801119
+- Make ntp, openconnect configurable
+
 * Tue Jul 02 2013 Corentin Lecouvey <corentin.lecouvey@eurogiciel.fr> accepted/tizen/20130701.201407@745c580
 - packaging: move NTP ConnMan scripts to packaging directory
 - Add option to disable link local address" into tizen
diff --git a/packaging/connman.spec b/packaging/connman.spec
index c2f9032d..b2b7d225 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -1,3 +1,6 @@
+%bcond_with     connman_openconnect
+%bcond_with     connman_ntp
+
 Name:           connman
 Version:        1.15
 Release:        1
@@ -14,8 +17,10 @@ BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libiptc)
 BuildRequires:  pkgconfig(xtables)
-BuildRequires:	pkgconfig(gnutls) 
+BuildRequires:  pkgconfig(gnutls)
+%if %{with connman_openconnect}
 BuildRequires:  openconnect
+%endif
 BuildRequires:  readline-devel
 %systemd_requires
 
@@ -23,18 +28,18 @@ BuildRequires:  readline-devel
 Connection Manager provides a daemon for managing Internet connections
 within embedded devices running the Linux operating system.
 
+%if %{with connman_openconnect}
 %package plugin-openconnect
 Summary:        Openconnect Support for Connman
-Group:          Connectivity/Connection Management
 Requires:       %{name} = %{version}
 Requires:       openconnect
 
 %description plugin-openconnect
 Openconnect Support for Connman.
+%endif
 
 %package test
 Summary:        Test Scripts for Connection Manager
-Group:          Development/Testing
 Requires:       %{name} = %{version}
 Requires:       dbus-python
 Requires:       python-gobject
@@ -45,7 +50,6 @@ Scripts for testing Connman and its functionality
 
 %package devel
 Summary:        Development Files for connman
-Group:          Development/Tools
 Requires:       %{name} = %{version}
 
 %description devel
@@ -53,8 +57,6 @@ Header files and development files for connman.
 
 %prep
 %setup -q
-cp %{SOURCE10} .
-cp %{SOURCE11} .
 cp %{SOURCE1001} .
 
 %build
@@ -64,9 +66,8 @@ cp %{SOURCE1001} .
             --enable-client \
             --enable-pacrunner \
             --enable-wifi=builtin \
+%if %{with connman_openconnect}
             --enable-openconnect \
-%if 0%{?enable_connman_features}
-            %connman_features \
 %endif
             --enable-test \
             --with-systemdunitdir=%{_unitdir}
@@ -76,32 +77,35 @@ make %{?_smp_mflags}
 %install
 %make_install
 
+%if %{with connman_ntp}
 mkdir -p %{buildroot}/usr/lib/systemd/ntp-units.d
-install -m644 40-connman-ntp.list %{buildroot}/usr/lib/systemd/ntp-units.d
-install -m644 connman-ntp.service %{buildroot}%{_unitdir}
+install -m644 %{SOURCE10} %{buildroot}/usr/lib/systemd/ntp-units.d
+install -m644 %{SOURCE11} %{buildroot}%{_unitdir}
+%install_service network.target.wants connman-ntp.service
+%install_service multi-user.target.wants connman-ntp.service
+%endif
 
 %install_service network.target.wants connman.service
-%install_service network.target.wants connman-ntp.service
 %install_service multi-user.target.wants connman.service
-%install_service multi-user.target.wants connman-ntp.service
 
-%docs_package 
+%docs_package
 
 %files
 %license COPYING
 %manifest connman.manifest
 %{_sbindir}/*
 %{_libdir}/connman/plugins/*.so
-%{_datadir}/man/*
 %config %{_sysconfdir}/dbus-1/system.d/*
 %{_unitdir}/connman.service
 %{_unitdir}/network.target.wants/connman.service
 %{_unitdir}/multi-user.target.wants/connman.service
+%if %{with connman_ntp}
+%dir /usr/lib/systemd/ntp-units.d
 %{_unitdir}/connman-ntp.service
 %{_unitdir}/multi-user.target.wants/connman-ntp.service
 %{_unitdir}/network.target.wants/connman-ntp.service
-%dir /usr/lib/systemd/ntp-units.d
 /usr/lib/systemd/ntp-units.d/40-connman-ntp.list
+%endif
 
 %files test
 %{_libdir}/%{name}/test/*
@@ -110,10 +114,12 @@ install -m644 connman-ntp.service %{buildroot}%{_unitdir}
 %{_includedir}/connman/*.h
 %{_libdir}/pkgconfig/*.pc
 
+%if %{with connman_openconnect}
 %files plugin-openconnect
 %{_unitdir}/connman-vpn.service
 %{_libdir}/connman/plugins-vpn/openconnect.so
 %{_libdir}/connman/scripts/openconnect-script
 %{_datadir}/dbus-1/system-services/net.connman.vpn.service
+%endif
 
 %changelog