summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/40-connman-ntp.list1
-rw-r--r--packaging/connman-ntp.service12
-rw-r--r--packaging/connman.changes3
-rw-r--r--packaging/connman.spec26
4 files changed, 33 insertions, 9 deletions
diff --git a/packaging/40-connman-ntp.list b/packaging/40-connman-ntp.list
new file mode 100644
index 00000000..9b842821
--- /dev/null
+++ b/packaging/40-connman-ntp.list
@@ -0,0 +1 @@
+connman-ntp.service
diff --git a/packaging/connman-ntp.service b/packaging/connman-ntp.service
new file mode 100644
index 00000000..1978f743
--- /dev/null
+++ b/packaging/connman-ntp.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Connman NTP service
+After=syslog.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash -c "dbus-send --system --type=method_call --print-reply --dest=net.connman / net.connman.Clock.SetProperty string:'TimeUpdates' variant:string:'auto'"
+ExecStop=/bin/bash -c "dbus-send --system --type=method_call --print-reply --dest=net.connman / net.connman.Clock.SetProperty string:'TimeUpdates' variant:string:'manual'"
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/packaging/connman.changes b/packaging/connman.changes
index a086aae2..d2d5a010 100644
--- a/packaging/connman.changes
+++ b/packaging/connman.changes
@@ -1,3 +1,6 @@
+* Fri Jun 28 2013 Corentin Lecouvey <corentin.lecouvey@eurogiciel.fr> accepted/tizen/20130614.152842@afff321
+- Add systemd service to manage ConnMan NTP feature (#TZPC-1974)
+
* Fri Jun 14 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130614.081002@fb8adbd
- Update to 1.15
diff --git a/packaging/connman.spec b/packaging/connman.spec
index cb183121..2b04cc23 100644
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -6,7 +6,10 @@ Summary: Connection Manager
Url: http://connman.net
Group: Connectivity/Connection Management
Source0: %{name}-%{version}.tar.xz
+Source10: 40-connman-ntp.list
+Source11: connman-ntp.service
Source1001: connman.manifest
+BuildRequires: systemd
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(libiptc)
@@ -14,10 +17,7 @@ BuildRequires: pkgconfig(xtables)
BuildRequires: pkgconfig(gnutls)
BuildRequires: openconnect
BuildRequires: readline-devel
-Requires: systemd
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
+%systemd_requires
%description
Connection Manager provides a daemon for managing Internet connections
@@ -53,7 +53,8 @@ Header files and development files for connman.
%prep
%setup -q
-
+cp %{SOURCE10} .
+cp %{SOURCE11} .
cp %{SOURCE1001} .
%build
@@ -75,11 +76,14 @@ make %{?_smp_mflags}
%install
%make_install
-mkdir -p %{buildroot}%{_unitdir}/network.target.wants
-ln -s ../connman.service %{buildroot}%{_unitdir}/network.target.wants/connman.service
+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_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
@@ -91,7 +95,11 @@ ln -s ../connman.service %{buildroot}%{_unitdir}/network.target.wants/connman.se
%{_unitdir}/connman.service
%{_unitdir}/network.target.wants/connman.service
%{_unitdir}/multi-user.target.wants/connman.service
-
+%{_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
%files test
%{_libdir}/%{name}/test/*