packages: ntp/ntp.spec - fix manpage install, todos; rel 3

[glen]

Author: glen                         Date: Fri Jan 22 18:23:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix manpage install, todos; rel 3

---- Files affected:
packages/ntp:
   ntp.spec (1.112 -> 1.113) 

---- Diffs:

================================================================
Index: packages/ntp/ntp.spec
diff -u packages/ntp/ntp.spec:1.112 packages/ntp/ntp.spec:1.113
--- packages/ntp/ntp.spec:1.112	Fri Jan 22 19:13:22 2010
+++ packages/ntp/ntp.spec	Fri Jan 22 19:23:49 2010
@@ -1,11 +1,16 @@
 # $Revision$, $Date$
+# TODO
+# - fix awkward package naming: put daemon to ntpd, client to ntpdate (FC like)
+#   but make it with grace migration period that ntp would be R ntpd
+# - run as ntp/ntp (fc patches)
+# - default config is too restrictive (ntpq -p should work locally)
 %include	/usr/lib/rpm/macros.perl
 Summary:	Network Time Protocol utilities
 Summary(pl.UTF-8):	Narzędzia do synchronizacji czasu (Network Time Protocol)
 Summary(pt_BR.UTF-8):	Network Time Protocol versão 4
 Name:		ntp
 Version:	4.2.4p8
-Release:	2
+Release:	3
 License:	distributable
 Group:		Daemons
 Source0:	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
@@ -128,20 +133,20 @@
 %patch7	-p0
 
 echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> configure.ac
+echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac
 
 %build
 %{__libtoolize}
 %{__aclocal} -I m4 -I libopts/m4
 %{__autoconf}
 %{__automake}
-
 cd sntp
 %{__libtoolize}
 %{__aclocal} -I libopts/m4
 %{__autoconf}
 %{__automake}
-
 cd ..
+
 %configure \
 	--with-binsubdir=sbin \
 	--enable-linuxcaps \
@@ -158,13 +163,13 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ntp.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/keys
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntpd
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntp
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/ntpd
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/ntp
-install man/*.1  $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ntp.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/keys
+install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntpd
+install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntp
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/ntpd
+cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/ntp
+cp -a man/*.1  $RPM_BUILD_ROOT%{_mandir}/man1
 
 cat > $RPM_BUILD_ROOT/etc/cron.hourly/ntp <<'EOF'
 #!/bin/sh
@@ -176,7 +181,7 @@
 
 %post
 /sbin/chkconfig --add ntpd
-%service ntpd restart "ntpd daemon"
+%service ntpd restart "NTP Daemon"
 
 %preun
 if [ "$1" = "0" ]; then
@@ -242,6 +247,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.113  2010/01/22 18:23:49  glen
+- fix manpage install, todos; rel 3
+
 Revision 1.112  2010/01/22 18:13:22  sparky
 - regenerate auto* in sntp directory
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp.spec?r1=1.112&r2=1.113&f=u