chrony-2.1.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9678 ec354946-7b23-47d6-9f5a-488ba84defc7

c/chrony/chrony-vl.spec

@@ -1,5 +1,5 @@
 Name:           chrony
-Version:        1.31
+Version:        2.1.1
 Release:        1%{?_dist_release}
 Summary:        An NTP client/server
 
@@ -8,7 +8,7 @@ License:        GPLv2
 URL:            http://chrony.tuxfamily.org
 Source0:        http://download.tuxfamily.org/chrony/chrony-%{version}%{?prerelease}.tar.gz
 Source1:        chrony.conf
-Source2:        chrony.keys
+Source2:        chrony.dhclient
 Source3:        chronyd.sysconfig
 Source4:        chronyd.init
 Source5:        chrony.logrotate
@@ -21,6 +21,8 @@ Requires(post): chkconfig info
 Requires(preun): chkconfig initscripts info
 Requires(postun): initscripts
 
+Obsoletes:      ntp < 4.2.6p5
+
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: tomop
@@ -35,18 +37,27 @@ clocks, system real-time clock or manual input as time references.
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
 
+echo '# Keys used by chronyd for command and NTP authentication' > chrony.keys
+
+# regenerate the file from getdate.y
+rm -f getdate.c
+
 %build
-CFLAGS="$RPM_OPT_FLAGS"
-%ifarch %{sparc}
-CFLAGS="$CFLAGS -pie -fPIE"
-%else
-CFLAGS="$CFLAGS -pie -fpie"
-%endif
-export CFLAGS
-export LDFLAGS="-Wl,-z,relro,-z,now"
-
-%configure --docdir=%{_docdir} --enable-forcednsretry
-make %{?_smp_mflags} getdate all docs
+#CFLAGS="$RPM_OPT_FLAGS"
+#%ifarch %{sparc}
+#CFLAGS="$CFLAGS -pie -fPIE"
+#%else
+#CFLAGS="$CFLAGS -pie -fpie"
+#%endif
+#export CFLAGS
+#export LDFLAGS="-Wl,-z,relro,-z,now"
+
+%configure \
+	--docdir=%{_docdir} \
+	--with-user=chrony \
+	--with-sendmail=%{_sbindir}/sendmail \
+	--enable-forcednsretry
+make %{?_smp_mflags} all docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,11 +66,19 @@ make install install-docs DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_docdir}
 
-mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir}/{sysconfig,logrotate.d},%{_initrddir}}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,logrotate.d}
+mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{lib,log}/chrony
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d
 
 install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.conf
-install -m 640 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/chrony.keys
+install -m 640 -p chrony.keys $RPM_BUILD_ROOT%{_sysconfdir}/chrony.keys
+install -m 755 -p examples/chrony.nm-dispatcher \
+	$RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/20-chrony
+install -m 755 -p %{SOURCE2} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d/chrony.sh
+
 install -m 644 -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/chronyd
 install -m 755 -p %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/chronyd
 install -m 644 -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/chrony
@@ -97,12 +116,14 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING NEWS README chrony.txt faq.txt examples/*
+%doc COPYING FAQ NEWS README chrony.txt examples/*
 %config(noreplace) %{_sysconfdir}/chrony.conf
 %config(noreplace) %verify(not md5 size mtime) %attr(640,root,chrony) %{_sysconfdir}/chrony.keys
 %config(noreplace) %{_sysconfdir}/sysconfig/chronyd
 %config(noreplace) %{_sysconfdir}/logrotate.d/chrony
 %{_initrddir}/chronyd
+%{_sysconfdir}/NetworkManager/dispatcher.d/20-chrony
+%{_sysconfdir}/dhcp/dhclient.d/chrony.sh
 %{_bindir}/chronyc
 %{_sbindir}/chronyd
 %{_infodir}/chrony.info*
@@ -113,6 +134,9 @@ fi
 %dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony
 
 %changelog
+* Sat Jul 25 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.1-1
+- new upstream release.
+
 * Tue Dec 23 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.31-1
 - new upstream release.