- up to 2.1

[packages/chrony.git] / chrony.spec

diff --git a/chrony.spec b/chrony.spec
index be52de4fc2c898298e096db3b47851b8bac64545..d99a3481e6ce20d7d14dae4fe1477f1a916fa5ae 100644 (file)
--- a/chrony.spec
+++ b/chrony.spec
@@ -1,12 +1,12 @@
 Summary:       An NTP client/server
 Name:          chrony
-Version:       1.26
-Release:       5
+Version:       2.1
+Release:       1
 License:       GPL v2
 Group:         Daemons
 URL:           http://chrony.tuxfamily.org/
 Source0:       http://download.tuxfamily.org/chrony/%{name}-%{version}.tar.gz
-# Source0-md5: ad6dd619ff1986e4ff780363c64e2246
+# Source0-md5: 7ea7177fd784527d70ed929c862bba8f
 Source1:       %{name}.conf
 Source2:       %{name}.keys
 Source3:       %{name}d.sysconfig
@@ -15,8 +15,9 @@ Source5:      %{name}.logrotate
 Source6:       %{name}d.upstart
 BuildRequires: bison
 BuildRequires: libcap-devel
+BuildRequires: nss-devel
 BuildRequires: readline-devel
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.453
 BuildRequires: texinfo
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -27,11 +28,17 @@ Requires(pre):      /usr/sbin/useradd
 Provides:      group(ntp)
 Provides:      ntpdaemon
 Provides:      user(ntp)
+Conflicts:     logrotate < 3.8.0
 Obsoletes:     ntpdaemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/ntp
 
+# assume gcc 3.4 has it
+%if "%{cc_version}" >= "3.4"
+%define                specflags       -pie -fpie
+%endif
+
 %description
 A client/server for the Network Time Protocol, this program keeps your
 computer's clock accurate. It was specially designed to support
@@ -41,18 +48,17 @@ in permanently connected environments.
 %prep
 %setup -q
 
-%{__sed} -i -e 's,/usr/local,%{_prefix},g' *.texi
+%{__sed} -i -e 's,/usr/local,%{_prefix},g' *.texi.in
 
 %build
 # NOTE: It is not autoconf generated configre
 CC="%{__cc}" \
-CFLAGS="%{rpmcflags} -pie -fpie -Wmissing-prototypes -Wall" \
+CFLAGS="%{rpmcflags} -Wmissing-prototypes -Wall" \
 CPPFLAGS="%{rpmcppflags}" \
 ./configure \
        --prefix=%{_prefix} \
        --sysconfdir=%{_sysconfdir} \
        --docdir=%{_docdir} \
-       --with-readline \
        --without-editline \
 
 %{__make} getdate all docs
@@ -103,7 +109,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README chrony.txt faq.txt examples/*
+%doc NEWS README chrony.txt FAQ examples/*
 %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
@@ -113,7 +119,6 @@ fi
 %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*