From f68095248444c5ec76cf798fc39266ec38c6cbaf Mon Sep 17 00:00:00 2001 From: Zhang zhengguang Date: Fri, 4 Jul 2014 14:33:55 +0800 Subject: [PATCH] Enable ConnMan NTP configurable in spec file --- packaging/connman.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packaging/connman.spec b/packaging/connman.spec index 0f3c010..e8bfdad 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -1,3 +1,5 @@ +%bcond_with connman_ntp + Name: connman Version: 1.24 Release: 1 @@ -6,6 +8,8 @@ Summary: Connection Manager Url: http://connman.net Group: Network & Connectivity/Connection Management Source0: %{name}-%{version}.tar.gz +Source10: 40-connman-ntp.list +Source11: connman-ntp.service Source1001: connman.manifest BuildRequires: systemd BuildRequires: pkgconfig(dbus-1) @@ -62,6 +66,14 @@ make %{?_smp_mflags} %install %make_install +%if %{with connman_ntp} +mkdir -p %{buildroot}/usr/lib/systemd/ntp-units.d +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 + mkdir -p %{buildroot}%{_sysconfdir}/connman cp src/main.conf %{buildroot}%{_sysconfdir}/connman/main.conf @@ -89,6 +101,13 @@ systemctl daemon-reload %{_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 +/usr/lib/systemd/ntp-units.d/40-connman-ntp.list +%endif %files test %manifest %{name}.manifest -- 2.7.4