Author: spuk
Date: Tue Jan 30 15:56:15 2007
New Revision: 115513
Added:
packages/cooker/ntp/current/SOURCES/ntp-4.2.4-html2man-adjusts.patch
- copied, changed from r115063,
/packages/cooker/ntp/current/SOURCES/ntp-4.2.4-html2man-tickadj.patch
Removed:
packages/cooker/ntp/current/SOURCES/ntp-4.2.4-html2man-tickadj.patch
Modified:
packages/cooker/ntp/current/SPECS/ntp.spec
Log:
- small note about ntp-doc package in ntp package description
- renamed patch ntp-4.2.4-html2man-tickadj to ntp-4.2.4-html2man-adjusts
- made it add references to ntp_*(5) configuration manpages from
ntp.conf(5)
- made the generated SEE ALSO manpages sections note about ntp-doc package
instead of filesystem location
Copied: packages/cooker/ntp/current/SOURCES/ntp-4.2.4-html2man-adjusts.patch
(from r115063,
/packages/cooker/ntp/current/SOURCES/ntp-4.2.4-html2man-tickadj.patch)
==============================================================================
--- /packages/cooker/ntp/current/SOURCES/ntp-4.2.4-html2man-tickadj.patch
(original)
+++ packages/cooker/ntp/current/SOURCES/ntp-4.2.4-html2man-adjusts.patch
Tue Jan 30 15:56:15 2007
@@ -1,8 +1,14 @@
diff --git a/scripts/html2man.in b/scripts/html2man.in
-index b7cebce..d6d2320 100755
+index 3b072f4..a091742 100755
--- a/scripts/html2man.in
+++ b/scripts/html2man.in
-@@ -31,7 +31,8 @@ $MANDIR = "./man";
+@@ -26,15 +26,16 @@ $MANDIR = "./man";
+ 'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'],
+ 'ntptrace' => ['ntptrace', 8, 'ntpd(8)'],
+ 'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'],
+- 'confopt' => ['ntp.conf', 5, 'ntpd(8)'],
++ 'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_acc(5), ntp_auth(5),
ntp_clock(5), ntp_misc(5), ntp_mon(5)'],
+ 'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'],
'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'],
'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'],
'clockopt' => ['ntp_clock', 5, 'ntp.conf(5)'],
@@ -11,4 +17,8 @@
+ 'tickadj' => ['tickadj', 8, 'ntpd(8), adjtime(3)']);
# Disclaimer to go in SEE ALSO section of the man page
- $seealso_disclaimer = 'These man pages are automatically hacked from the main
NTP ' .
+-$seealso_disclaimer = "Primary source of documentation:
/usr/share/doc/ntp-*\n\n" .
++$seealso_disclaimer = "Primary source of documentation are the HTML docs in
the ntp-doc package.\n\n" .
+ "This file was automatically generated from HTML source.\n";
+
+ mkdir $MANDIR, 0777;
Modified: packages/cooker/ntp/current/SPECS/ntp.spec
==============================================================================
--- packages/cooker/ntp/current/SPECS/ntp.spec (original)
+++ packages/cooker/ntp/current/SPECS/ntp.spec Tue Jan 30 15:56:15 2007
@@ -32,8 +32,8 @@
Patch106: ntp-4.2.2-loopfilter.patch
Patch107: ntp-4.2.0-sbinpath.patch
Patch108: ntp-4.2.4-html2man.patch
-# just add tickadj manpage generation
-Patch109: ntp-4.2.4-html2man-tickadj.patch
+# Adjustments to manpage generation (not from Fedora)
+Patch109: ntp-4.2.4-html2man-adjusts.patch
Patch110: ntp-4.2.4-loopback.patch
Patch111: ntp-stable-4.2.0a-20050816-keyfile.patch
Patch112: ntp-4.2.4-sprintf.patch
@@ -64,6 +64,8 @@
Install the ntp package if you need tools for keeping your system's
time synchronized via the NTP protocol.
+Note: Primary, original, big, HTML documentation, is in the package ntp-doc.
+
%package client
Summary: The ntpdate client for setting system time from NTP servers
Group: System/Servers
@@ -114,7 +116,7 @@
%patch106 -p1 -b .loopfilter
%patch107 -p1 -b .sbinpath
%patch108 -p1 -b .html2man
-%patch109 -p1 -b .tickadj
+%patch109 -p1 -b .adjusts
%patch110 -p1 -b .loopback
%patch111 -p1 -b .keyfile
%patch112 -p1 -b .sprintf
