From 387bb85a8e28d3869e23782006298ca6de74fcf94b84c1e032ca4ff327efe6e7 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Fri, 1 Apr 2011 12:49:59 +0000 Subject: [PATCH] - Readd documentation of hostname and hostid to texinfo documentation. OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=94 --- _service:download_url:coreutils-8.10.tar.xz | 3 - coreutils-readd_documentation.patch | 100 ++++++++++++++++++ ...coreutils.spec => coreutils-testsuite.spec | 4 +- coreutils.changes | 6 ++ coreutils.spec | 2 + 5 files changed, 110 insertions(+), 5 deletions(-) delete mode 100644 _service:download_url:coreutils-8.10.tar.xz create mode 100644 coreutils-readd_documentation.patch rename _service:set_version:coreutils.spec => coreutils-testsuite.spec (99%) diff --git a/_service:download_url:coreutils-8.10.tar.xz b/_service:download_url:coreutils-8.10.tar.xz deleted file mode 100644 index 9fddd0a..0000000 --- a/_service:download_url:coreutils-8.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8258785cbab6580f2e0376769a7b98ab3e1ddfca2d6f48e5490a51688d0bee83 -size 4753304 diff --git a/coreutils-readd_documentation.patch b/coreutils-readd_documentation.patch new file mode 100644 index 0000000..2bd2382 --- /dev/null +++ b/coreutils-readd_documentation.patch @@ -0,0 +1,100 @@ +The documentation for hostname and hostid was missing from +coreutils 8.10 texinfo documentation. While not documenting hostname +could be argued, the man page of hostid directly refers to the +non-existing texinfo documentation. + +Index: doc/coreutils.texi +=================================================================== +--- doc/coreutils.texi.orig 2011-04-01 13:46:18.000000000 +0200 ++++ doc/coreutils.texi 2011-04-01 14:08:23.423850965 +0200 +@@ -65,6 +65,7 @@ + * fold: (coreutils)fold invocation. Wrap long input lines. + * groups: (coreutils)groups invocation. Print group names a user is in. + * head: (coreutils)head invocation. Output the first part of files. ++* hostid: (coreutils)hostid invocation. Print numeric host identifier. + * id: (coreutils)id invocation. Print user identity. + * install: (coreutils)install invocation. Copy and change attributes. + * join: (coreutils)join invocation. Join lines on a common field. +@@ -195,7 +196,7 @@ Free Documentation License''. + * File name manipulation:: dirname basename pathchk mktemp + * Working context:: pwd stty printenv tty + * User information:: id logname whoami groups users who +-* System context:: date arch nproc uname uptime ++* System context:: date arch nproc uname uptime hostname hostid + * SELinux context:: chcon runcon + * Modified command invocation:: chroot env nice nohup stdbuf su timeout + * Process control:: kill +@@ -413,6 +414,8 @@ System context + * nproc invocation:: Print the number of processors + * uname invocation:: Print system information + * uptime invocation:: Print system uptime and load ++* hostname invocation:: Print or set system name ++* hostid invocation:: Print numeric host identifier. + + @command{date}: Print or set system date and time + +@@ -13758,6 +13761,8 @@ information. + * nproc invocation:: Print the number of processors. + * uname invocation:: Print system information. + * uptime invocation:: Print system uptime and load. ++* hostname invocation:: Print or set system name. ++* hostid invocation:: Print numeric host identifier. + @end menu + + @node date invocation +@@ -14610,6 +14615,55 @@ also include processes in the uninterrup + those processes which are waiting for disk I/O). The Linux kernel + includes uninterruptible processes. + ++@node hostname invocation ++@section @command{hostname}: Print or set system name ++ ++@pindex hostname ++@cindex setting the hostname ++@cindex printing the hostname ++@cindex system name, printing ++@cindex appropriate privileges ++ ++With no arguments, @command{hostname} prints the name of the current host ++system. With one argument, it sets the current host name to the ++specified string. You must have appropriate privileges to set the host ++name. Synopsis: ++ ++@example ++hostname [@var{name}] ++@end example ++ ++The only options are @option{--help} and @option{--version}. @xref{Common ++options}. ++ ++@exitstatus ++ ++ ++@node hostid invocation ++@section @command{hostid}: Print numeric host identifier. ++ ++@pindex hostid ++@cindex printing the host identifier ++ ++@command{hostid} prints the numeric identifier of the current host ++in hexadecimal. This command accepts no arguments. ++The only options are @option{--help} and @option{--version}. ++@xref{Common options}. ++ ++For example, here's what it prints on one system I use: ++ ++@example ++$ hostid ++1bac013d ++@end example ++ ++On that system, the 32-bit quantity happens to be closely ++related to the system's Internet address, but that isn't always ++the case. ++ ++@exitstatus ++ ++ + @node SELinux context + @chapter SELinux context + diff --git a/_service:set_version:coreutils.spec b/coreutils-testsuite.spec similarity index 99% rename from _service:set_version:coreutils.spec rename to coreutils-testsuite.spec index 21617e0..eea7759 100644 --- a/_service:set_version:coreutils.spec +++ b/coreutils-testsuite.spec @@ -23,8 +23,8 @@ BuildRequires: help2man libacl-devel libcap-devel libselinux-devel pam-devel xz Url: http://www.gnu.org/software/coreutils/ License: GFDLv1.2 ; GPLv2+ ; GPLv3+ Group: System/Base -Version: 8.10 -Release: 0 +Version: 8.10 +Release: 0 Provides: fileutils = %{version}, sh-utils = %{version}, stat = %version}, textutils = %{version}, mktemp = %{version} Obsoletes: fileutils < %{version}, sh-utils < %{version}, stat < %version}, textutils < %{version}, mktemp < %{version} Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9 diff --git a/coreutils.changes b/coreutils.changes index ef2de1d..acf4c93 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 1 14:14:23 CEST 2011 - pth@suse.de + +- Readd documentation of hostname and hostid to texinfo + documentation. + ------------------------------------------------------------------- Thu Feb 10 14:35:49 CET 2011 - pth@suse.de diff --git a/coreutils.spec b/coreutils.spec index d12bcd9..5587a3e 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -50,6 +50,7 @@ Patch22: coreutils-8.6-log-all-su-attempts.diff Patch23: coreutils-8.6-set-sane-default-path.diff Patch24: coreutils-8.6-honor-settings-in-etc-default-su-resp-etc-login.defs.diff Patch25: coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +Patch26: coreutils-readd_documentation.patch # Patch30: coreutils-8.6-compile-su-with-fpie.diff Patch31: coreutils-getaddrinfo.patch @@ -94,6 +95,7 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 # %patch30 -p1 %patch31