X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=chrony.spec;h=5af60727330959d5d1e382ae319f130730917825;hb=e4df7b950aabde6a8b9d2e25ab0a922a20f0e61b;hp=dba965bd713d4bcdb01fc904a9b3d40522f78dd0;hpb=0ef1a5c8982b2ed548637d603f2bc25d2cc88d38;p=packages%2Fchrony.git

diff --git a/chrony.spec b/chrony.spec
index dba965b..5af6072 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -1,22 +1,23 @@
 Summary:	An NTP client/server
 Name:		chrony
-Version:	1.26
-Release:	2
+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:	ad6dd619ff1986e4ff780363c64e2246
+# Source0-md5:	81ab62cf5d60b4b3fa8cd2c1b267ffd9
 Source1:	%{name}.conf
 Source2:	%{name}.keys
 Source3:	%{name}d.sysconfig
 Source4:	%{name}d.init
 Source5:	%{name}.logrotate
+URL:		http://chrony.tuxfamily.org/
+BuildRequires:	asciidoc
 BuildRequires:	bison
 BuildRequires:	libcap-devel
+BuildRequires:	nss-devel
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.202
-BuildRequires:	texinfo
+BuildRequires:	rpmbuild(macros) >= 1.453
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
@@ -27,10 +28,16 @@ Provides:	group(ntp)
 Provides:	ntpdaemon
 Provides:	user(ntp)
 Obsoletes:	ntpdaemon
+Conflicts:	logrotate < 3.8.0
 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
@@ -40,21 +47,19 @@ in permanently connected environments.
 %prep
 %setup -q
 
-%{__sed} -i -e 's,/usr/local,%{_prefix},g' *.texi
-
 %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
+%{__make} getdate all docs \
+	ADOC=asciidoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,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
 
@@ -93,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
@@ -101,7 +104,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README chrony.txt faq.txt 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
@@ -110,11 +113,9 @@ 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*
-%{_infodir}/chrony.info*
 
 %dir %attr(770,root,ntp) /var/lib/ntp
 %attr(640,ntp,ntp) %ghost /var/lib/ntp/drift