- up to 3.3

[packages/chrony.git] / chrony.spec

diff --git a/chrony.spec b/chrony.spec
index 53ddf4ae1c2e1d34356d67411ffb24020daf0d18..5af60727330959d5d1e382ae319f130730917825 100644 (file)
--- a/chrony.spec
+++ b/chrony.spec
@@ -1,25 +1,23 @@
 Summary:       An NTP client/server
 Name:          chrony
-Version:       1.31.1
+Version:       3.3
 Release:       1
 License:       GPL v2
 Group:         Daemons
-URL:           http://chrony.tuxfamily.org/
 Source0:       http://download.tuxfamily.org/chrony/%{name}-%{version}.tar.gz
-# Source0-md5: 01e54c63d09a310f30c4e399f18499df
+# Source0-md5: 81ab62cf5d60b4b3fa8cd2c1b267ffd9
 Source1:       %{name}.conf
 Source2:       %{name}.keys
 Source3:       %{name}d.sysconfig
 Source4:       %{name}d.init
 Source5:       %{name}.logrotate
-Source6:       %{name}d.upstart
-Patch0:                chrony-sysheaders.patch
+URL:           http://chrony.tuxfamily.org/
+BuildRequires: asciidoc
 BuildRequires: bison
 BuildRequires: libcap-devel
 BuildRequires: nss-devel
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.453
-BuildRequires: texinfo
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
@@ -29,8 +27,8 @@ Requires(pre):        /usr/sbin/useradd
 Provides:      group(ntp)
 Provides:      ntpdaemon
 Provides:      user(ntp)
-Conflicts:     logrotate < 3.8.0
 Obsoletes:     ntpdaemon
+Conflicts:     logrotate < 3.8.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/ntp
@@ -48,9 +46,6 @@ in permanently connected environments.
 
 %prep
 %setup -q
-%patch0 -p1
-
-%{__sed} -i -e 's,/usr/local,%{_prefix},g' *.texi.in
 
 %build
 # NOTE: It is not autoconf generated configre
@@ -63,11 +58,12 @@ CPPFLAGS="%{rpmcppflags}" \
        --docdir=%{_docdir} \
        --without-editline \
 
-%{__make} getdate all docs
+%{__make} getdate all docs \
+       ADOC=asciidoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d,init} \
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} \
        $RPM_BUILD_ROOT{%{_sysconfdir},/var/{lib/ntp,log/chrony}}
 
 %{__make} install install-docs \
@@ -80,7 +76,6 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/keys
 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/chronyd
 cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/chrony
 install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/chronyd
-cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/init/chronyd.conf
 
 touch $RPM_BUILD_ROOT%{_localstatedir}/lib/ntp/{drift,rtc}
 
@@ -92,7 +87,6 @@ rm -rf $RPM_BUILD_ROOT
 %useradd -u 246 -d %{_localstatedir}/lib/ntp -g ntp -c "NTP Daemon" ntp
 
 %post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 /sbin/chkconfig --add chronyd
 %service chronyd restart
 
@@ -103,7 +97,6 @@ if [ "$1" = "0" ]; then
 fi
 
 %postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 if [ "$1" = "0" ]; then
        %userremove ntp
        %groupremove ntp
@@ -111,21 +104,18 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README chrony.txt FAQ examples/*
+%doc NEWS README FAQ examples/* doc/{faq,installation}.html
 %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/chrony.conf
 %attr(640,root,ntp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/keys
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/chronyd
-%config(noreplace) %verify(not md5 mtime size) /etc/init/chronyd.conf
 %config(noreplace) /etc/logrotate.d/chrony
 %attr(754,root,root) /etc/rc.d/init.d/chronyd
 %attr(755,root,root) %{_bindir}/chronyc
 %attr(755,root,root) %{_sbindir}/chronyd
-%{_mandir}/man1/chrony.1*
 %{_mandir}/man1/chronyc.1*
 %{_mandir}/man5/chrony.conf.5*
 %{_mandir}/man8/chronyd.8*
-%{_infodir}/chrony.info*
 
 %dir %attr(770,root,ntp) /var/lib/ntp
 %attr(640,ntp,ntp) %ghost /var/lib/ntp/drift