From 9befe89ae5ca7ec17a560bf097712c0d5ab6e831 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 15 Oct 2020 12:53:02 -0700 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/time#087ba8ab2cb73faa48a58e429b2278c0f35764b0 --- .gitignore | 3 + sources | 1 + tests/maximum_RSS/Makefile | 65 ++++ tests/maximum_RSS/PURPOSE | 3 + tests/maximum_RSS/runtest.sh | 47 +++ tests/tests.yml | 16 + ...Prefer-clock_gettime-CLOCK_MONOTONIC.patch | 108 ++++++ ...fo-directory-index-entry-description.patch | 32 ++ ...stead-of-kilobytes-in-a-documentatio.patch | 189 +++++++++++ time.spec | 312 ++++++++++++++++++ 10 files changed, 776 insertions(+) create mode 100644 sources create mode 100644 tests/maximum_RSS/Makefile create mode 100644 tests/maximum_RSS/PURPOSE create mode 100755 tests/maximum_RSS/runtest.sh create mode 100644 tests/tests.yml create mode 100644 time-1.8-Prefer-clock_gettime-CLOCK_MONOTONIC.patch create mode 100644 time-1.9-Improve-info-directory-index-entry-description.patch create mode 100644 time-1.9-Use-kibibytes-instead-of-kilobytes-in-a-documentatio.patch create mode 100644 time.spec diff --git a/.gitignore b/.gitignore index e69de29..7b5af79 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,3 @@ +time-1.7.tar.gz +/time-1.8.tar.gz +/time-1.9.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..970e510 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (time-1.9.tar.gz) = 5c6dabbbe71e9103a47b892b86bb914c1704122d4fe7dff1e2cbd28503297163118d295077d8e062b035d673a1f91c36f8a45c7383f374fd766942b32bde4406 diff --git a/tests/maximum_RSS/Makefile b/tests/maximum_RSS/Makefile new file mode 100644 index 0000000..3974ff1 --- /dev/null +++ b/tests/maximum_RSS/Makefile @@ -0,0 +1,65 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/time/Sanity/maximum_RSS +# Description: check if RSS usage is measured reasonable (in bug, reported value vas 4-times bigger) +# Author: Ondrej Ptak +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2015 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/CoreOS/time/Sanity/maximum_RSS +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + test -x runtest.sh || chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Ondrej Ptak " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: check if RSS usage is measured reasonable (in bug, reported value vas 4-times bigger)" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 5m" >> $(METADATA) + @echo "RunFor: time" >> $(METADATA) + @echo "Requires: time perl bc" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Bug: 703865" >> $(METADATA) + @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/maximum_RSS/PURPOSE b/tests/maximum_RSS/PURPOSE new file mode 100644 index 0000000..151149b --- /dev/null +++ b/tests/maximum_RSS/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /CoreOS/time/Sanity/maximum_RSS +Description: check if RSS usage is measured reasonable (in bug, reported value vas 4-times bigger) +Author: Ondrej Ptak diff --git a/tests/maximum_RSS/runtest.sh b/tests/maximum_RSS/runtest.sh new file mode 100755 index 0000000..e68f7ba --- /dev/null +++ b/tests/maximum_RSS/runtest.sh @@ -0,0 +1,47 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/time/Sanity/maximum_RSS +# Description: check if RSS usage is measured reasonable (in bug, reported value vas 4-times bigger) +# Author: Ondrej Ptak +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2015 Red Hat, Inc. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/bin/rhts-environment.sh || exit 1 +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGES=${PACKAGES:-"time"} + +rlJournalStart + rlPhaseStartTest + supposed_RSS=412024 + rlLogInfo "RSS usage of given script is suppose to be about $supposed_RSS kB" + rlRun "maxRSS=$(/usr/bin/time -f %M perl -e '"x" x 400 x 1024 x 1024' 2>&1)" 0 "Measuring RSS usage" + rlAssertGreater "RSS max usage should be < 450000" 450000 $maxRSS + rlAssertGreater "RSS max usage should be > 400000" $maxRSS 400000 + echo "$maxRSS/$supposed_RSS*100" + coef=`echo "$maxRSS*100/$supposed_RSS" | bc` + rlLogInfo "RSS value is $coef % of expected value" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..043bc2c --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,16 @@ +--- +# Tests for classic and container +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + - container + - atomic + tests: + - maximum_RSS + required_packages: + - bash + - bc + - perl-interpreter + - time diff --git a/time-1.8-Prefer-clock_gettime-CLOCK_MONOTONIC.patch b/time-1.8-Prefer-clock_gettime-CLOCK_MONOTONIC.patch new file mode 100644 index 0000000..ec5c8aa --- /dev/null +++ b/time-1.8-Prefer-clock_gettime-CLOCK_MONOTONIC.patch @@ -0,0 +1,108 @@ +From a3c400a8553b598bc2fd01eb0f63c5748b2147e1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 8 Nov 2017 17:02:42 +0100 +Subject: [PATCH] Prefer clock_gettime(CLOCK_MONOTONIC) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gettimeofday() reports wrong elapsed real time if a time step was +inserted while running a program. This can happen on initial time +adjustment from NTP server or by manual adjustement by date command. + +This patch uses clock_gettime(CLOCK_MONOTONIC) instead (if available) +that does not suffer from the issue. + + + +Signed-off-by: Petr Písař +--- + configure.ac | 3 +++ + src/resuse.c | 27 +++++++++++++++++++++++++-- + 2 files changed, 28 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ede8fd5..d2950bd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -72,6 +72,9 @@ dnl Checks for library functions. + AC_FUNC_VPRINTF + AC_FUNC_WAIT3 + AC_CHECK_FUNCS(strerror) ++AC_SEARCH_LIBS(clock_gettime, [rt]) ++test "$ac_cv_search_clock_gettime" != "no" && \ ++ AC_DEFINE([HAVE_CLOCK_GETTIME], [1], [System provides clock_gettime() call]) + + + # What memory units are reported by getrusage(2) ? +diff --git a/src/resuse.c b/src/resuse.c +index d2ab870..ec54863 100644 +--- a/src/resuse.c ++++ b/src/resuse.c +@@ -26,7 +26,14 @@ + #include + #include + +-#if !HAVE_WAIT3 ++#if HAVE_WAIT3 ++# if HAVE_CLOCK_GETTIME ++# ifndef _POSIX_C_SOURCE ++# define _POSIX_C_SOURCE 199309L ++# endif ++# include ++# endif ++#else + # include + # ifndef HZ + # include +@@ -51,7 +58,14 @@ resuse_start (resp) + RESUSE *resp; + { + #if HAVE_WAIT3 ++#if HAVE_CLOCK_GETTIME ++ struct timespec res; ++ clock_gettime(CLOCK_MONOTONIC, &res); ++ resp->start.tv_sec = res.tv_sec; ++ resp->start.tv_usec = res.tv_nsec / 1000; ++#else + gettimeofday (&resp->start, (struct timezone *) 0); ++#endif /* !HAVE_CLOCK_GETTIME */ + #else + long value; + struct tms tms; +@@ -59,7 +73,7 @@ resuse_start (resp) + value = times (&tms); + resp->start.tv_sec = value / HZ; + resp->start.tv_usec = value % HZ * (1000000 / HZ); +-#endif ++#endif /* !HAVE_WAIT3 */ + } + + /* Wait for and fill in data on child process PID. +@@ -79,6 +93,9 @@ resuse_end (pid, resp) + int status; + + #if HAVE_WAIT3 ++#if HAVE_CLOCK_GETTIME ++ struct timespec res; ++#endif + pid_t caught; + + /* Ignore signals, but don't ignore the children. When wait3 +@@ -89,7 +106,13 @@ resuse_end (pid, resp) + return 0; + } + ++#if HAVE_CLOCK_GETTIME ++ clock_gettime(CLOCK_MONOTONIC, &res); ++ resp->elapsed.tv_sec = res.tv_sec; ++ resp->elapsed.tv_usec = res.tv_nsec / 1000; ++#else + gettimeofday (&resp->elapsed, (struct timezone *) 0); ++#endif + #else /* !HAVE_WAIT3 */ + long value; + struct tms tms; +-- +2.13.6 + diff --git a/time-1.9-Improve-info-directory-index-entry-description.patch b/time-1.9-Improve-info-directory-index-entry-description.patch new file mode 100644 index 0000000..99cc110 --- /dev/null +++ b/time-1.9-Improve-info-directory-index-entry-description.patch @@ -0,0 +1,32 @@ +From d8cf31417c84646497657280830c432b6f412495 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 18 Jun 2018 10:05:06 +0200 +Subject: [PATCH] Improve info directory index entry description +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Describing "time" as "time" is not explanatory. Use better +description. + +Signed-off-by: Petr Písař +--- + doc/time.texi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/time.texi b/doc/time.texi +index 63d25b4..dac65b4 100644 +--- a/doc/time.texi ++++ b/doc/time.texi +@@ -28,7 +28,7 @@ Texts. A copy of the license is included in the section entitled + + @dircategory Basics + @direntry +-* Time: (time). time ++* Time: (time). GNU time utility. + @end direntry + + +-- +2.14.4 + diff --git a/time-1.9-Use-kibibytes-instead-of-kilobytes-in-a-documentatio.patch b/time-1.9-Use-kibibytes-instead-of-kilobytes-in-a-documentatio.patch new file mode 100644 index 0000000..de751d8 --- /dev/null +++ b/time-1.9-Use-kibibytes-instead-of-kilobytes-in-a-documentatio.patch @@ -0,0 +1,189 @@ +From 9fd52d5705fad70c0cb4ad8d508596a488262acf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 13 Jul 2020 09:24:35 +0200 +Subject: [PATCH] Use kibibytes instead of kilobytes in a documentation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch does not changes any output of the time program. It only +clarifies a manual and the comments. + + + +Signed-off-by: Petr Písař +--- + configure.ac | 6 +++--- + doc/time.texi | 12 ++++++------ + src/rusage-kb.c | 4 ++-- + src/rusage-kb.h | 10 +++++----- + src/time.c | 6 +++--- + tests/time-max-rss.sh | 4 ++-- + 6 files changed, 21 insertions(+), 21 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d2950bd..67738b5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -90,7 +90,7 @@ if test -z "$time_getrusage_mem_units" ; then + + solaris*) time_getrusage_mem_units=pages ;; + +- # As a fallback, assume KB (the most common value). ++ # As a fallback, assume KiB (the most common value). + # Set the 'warn' variable to warn the user at the end + # of ./configure + *) time_getrusage_mem_units=kb +@@ -104,7 +104,7 @@ case $time_getrusage_mem_units in + kb) + AC_DEFINE([GETRUSAGE_RETURNS_KB],[1], + [Define to 1 if getrusage(2) on this systems returns +- ru_maxrss in kilobytes]) ++ ru_maxrss in kibibytes]) + ;; + + bytes) +@@ -140,7 +140,7 @@ AC_OUTPUT + # Warn the user if getrusage(2) behaviour on this OS is unknown + if test "$warn_getrusage_mem_units" ; then + AC_MSG_WARN([unknown getrusage behavior on operating system '$host_os'. +- Assuming Kilobytes. ++ Assuming kibibytes. + please report this with the output of 'uname -a' to + bug-time@gnu.org]) + fi +diff --git a/doc/time.texi b/doc/time.texi +index dac65b4..3a05ed9 100644 +--- a/doc/time.texi ++++ b/doc/time.texi +@@ -241,22 +241,22 @@ times divied by the total running time. + @table @code + @item M + Maximum resident set size of the process during its lifetime, in +-Kilobytes. ++kibibytes. + + @item t +-Average resident set size of the process, in Kilobytes. ++Average resident set size of the process, in kibibytes. + + @item K +-Average total (data+stack+text) memory use of the process, in Kilobytes. ++Average total (data+stack+text) memory use of the process, in kibibytes. + + @item D +-Average size of the process's unshared data area, in Kilobytes. ++Average size of the process's unshared data area, in kibibytes. + + @item p +-Average size of the process's unshared stack, in Kilobytes. ++Average size of the process's unshared stack, in kibibytes. + + @item X +-Average size of the process's shared text, in Kilobytes. ++Average size of the process's shared text, in kibibytes. + + @item Z + System's page size, in bytes. This is a per-system constant, but +diff --git a/src/rusage-kb.c b/src/rusage-kb.c +index aad06b8..04352cd 100644 +--- a/src/rusage-kb.c ++++ b/src/rusage-kb.c +@@ -25,8 +25,8 @@ + #include + #include + +-/* Return the number of kilobytes corresponding to a number of pages PAGES. +- (Actually, we use it to convert pages*ticks into kilobytes*ticks.) ++/* Return the number of kibibytes corresponding to a number of pages PAGES. ++ (Actually, we use it to convert pages*ticks into kibibytes*ticks.) + + Try to do arithmetic so that the risk of overflow errors is minimized. + This is funky since the pagesize could be less than 1K. +diff --git a/src/rusage-kb.h b/src/rusage-kb.h +index 4a53515..b7b1155 100644 +--- a/src/rusage-kb.h ++++ b/src/rusage-kb.h +@@ -19,7 +19,7 @@ + #ifndef _RUSAGE_KB_ + #define _RUSAGE_KB_ + +-/* As of 2017, most kernels' getrusage(2) returns ru_maxrss in kilobytes: ++/* As of 2017, most kernels' getrusage(2) returns ru_maxrss in kibibytes: + Linux, Hurd, Free/Open/Net-BSD, MINIX, AIX7 + + OpenSolaris's getrusage(2) documents a return value in pages, +@@ -32,20 +32,20 @@ + + #if GETRUSAGE_RETURNS_KB + +-/* define as no-op, as RUSAGE values are already in KB */ ++/* define as no-op, as RUSAGE values are already in KiB */ + #define RUSAGE_MEM_TO_KB(x) (x) + + #elif GETRUSAGE_RETURNS_BYTES + +-/* Convert bytes to kilobytes */ ++/* Convert bytes to kibibytes */ + #define RUSAGE_MEM_TO_KB(x) ((x)/1024) + + #elif GETRUSAGE_RETURNS_PAGES + +-/* Convert bytes to kilobytes */ ++/* Convert bytes to kibibytes */ + #define RUSAGE_MEM_TO_KB(x) (ptok (x)) + +-/* A function to get the system's page size and convert pages to KB */ ++/* A function to get the system's page size and convert pages to KiB */ + unsigned long + ptok (unsigned long pages); + +diff --git a/src/time.c b/src/time.c +index 7e07995..f76265a 100644 +--- a/src/time.c ++++ b/src/time.c +@@ -108,8 +108,8 @@ typedef RETSIGTYPE (*sighandler) (); + and 100 on the sun4. + + Some manuals have an apparent error, claiming that units for average +- sizes are kb*sec. Judging by the contents of `struct rusage', it +- looks like it should be kb*ticks, like on SunOS. Ticks/sec seems ++ sizes are KiB*sec. Judging by the contents of `struct rusage', it ++ looks like it should be KiB*ticks, like on SunOS. Ticks/sec seems + to be (empirically): + 50 Mt. Xinu + 250 Ultrix (mips) +@@ -412,7 +412,7 @@ linear_argv (argv) + x == exit status of command + + Various memory usages are found by converting from page-seconds +- to kbytes by multiplying by the page size, dividing by 1024, ++ to kibibytes by multiplying by the page size, dividing by 1024, + and dividing by elapsed real time. + + FP is the stream to print to. +diff --git a/tests/time-max-rss.sh b/tests/time-max-rss.sh +index 0adda5c..5ecd3f2 100755 +--- a/tests/time-max-rss.sh ++++ b/tests/time-max-rss.sh +@@ -27,7 +27,7 @@ fail= + # The auxiliary program should be built and runnable + time-aux || framework_failure_ "time-aux is missing/not runnable" + +-# Get the baseline number of MAX-RSS kilobytes ++# Get the baseline number of MAX-RSS kibibytes + # use by the program when not allocating any extra memory + env time -o mem-baseline -f "%M" time-aux \ + || framework_failure_ "failed to run time/time-aux (baseline max-rss)" +@@ -49,7 +49,7 @@ test "$b" -eq "0" && test "$c" -eq 0 \ + # There could be alot of variation between each invocation, + # accept a reasonable range + if test "$d" -ge 5000 && test "$d" -le 6000 ; then +- : # acceptable values: 5000-6000 KB ++ : # acceptable values: 5000-6000 KiB + else + cat<&2 + time(1) failed to detect 5MB allcoation. +-- +2.25.4 + diff --git a/time.spec b/time.spec new file mode 100644 index 0000000..2f092d1 --- /dev/null +++ b/time.spec @@ -0,0 +1,312 @@ +Summary: A GNU utility for monitoring a program's use of system resources +Name: time +Version: 1.9 +Release: 10%{?dist} +# src/time.c: GPLv3+ +# COPYING: GPLv3 text +# doc/time.texi: GFDL +# doc/fdl.texi: GFDL 1.3 text +# doc/time.info: GFDL +# lib/stdnoreturn.in.h: GPLv3+ +# lib/strerror-override.c: GPLv3+ +# lib/error.h: GPLv3+ +## Not in a binary package +# tests/init.sh: GPLv3+ +# INSTALL: FSFAP +# configure: FSFUL +# build-aux/config.guess: GPLv3+ with exceptions +# build-aux/install-sh: MIT and Public Domain +# build-aux/config.rpath: FSFULLR +# build-aux/test-driver: GPLv2+ with exceptions +# build-aux/update-copyright: GPLv3+ +# build-aux/useless-if-before-free: GPLv3+ +# build-aux/vc-list-files: GPLv3+ +# build-aux/missing: GPLv2+ with exceptions +# build-aux/compile: GPLv2+ with exceptions +# build-aux/config.sub: GPLv3+ with exceptions +# build-aux/gitlog-to-changelog: GPLv3+ +# build-aux/git-version-gen: GPLv3+ +# build-aux/texinfo.tex: GPLv3+ with exceptions +# build-aux/depcomp: GPLv2+ with exceptions +# build-aux/mdate-sh: GPLv2+ with exceptions +# GNUmakefile: GPLv3+ +# m4/asm-underscore.m4: FSFULLR +# m4/gnulib-cache.m4: GPLv3+ with exceptions +# m4/host-cpu-c-abi.m4: FSFULLR +# m4/longlong.m4: FSFULLR +# m4/ssize_t.m4: FSFULLR +# m4/stdnoreturn.m4: FSFULLR +# maint.mk: GPLv3+ +# tests/time-posix-quiet.sh: GPLv3+ +License: GPLv3+ and GFDL +Url: http://www.gnu.org/software/%{name}/ +Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz +# Fix measuring time when a clock experiences a jump, bug #1004416, +# +Patch0: time-1.8-Prefer-clock_gettime-CLOCK_MONOTONIC.patch +# Fix info directory entry +Patch1: time-1.9-Improve-info-directory-index-entry-description.patch +# Clarify RSS size as kibibytes in a documentation, proposed to an upstream, +# +Patch2: time-1.9-Use-kibibytes-instead-of-kilobytes-in-a-documentatio.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bash +BuildRequires: coreutils +BuildRequires: gcc +BuildRequires: make +BuildRequires: texinfo +# Tests +BuildRequires: sed + +%description +The GNU time utility runs another program, collects information about +the resources used by that program while it is running, and displays +the results. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +autoreconf -fi + +%build +%configure +%{make_build} + +%install +%{make_install} +# Remove info index, it's updated by file triggers +rm -f $RPM_BUILD_ROOT%{_infodir}/dir + +%check +%{make_build} check + +%files +%license COPYING +%doc AUTHORS ChangeLog NEWS README +%{_bindir}/time +%{_infodir}/time.info* +# time(1) manual page lives in man-pages package, bug #1612294. + +%changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Petr Pisar - 1.9-9 +- Clarify RSS size as kibibytes in a documentation + +* Fri Jan 31 2020 Fedora Release Engineering - 1.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Aug 07 2018 Petr Pisar - 1.9-5 +- Remove time(1) manual page because it's provided by man-pages (bug #1612294) + +* Mon Aug 06 2018 Petr Pisar - 1.9-4 +- Add time(1) manual page (bug #1612294) + +* Sat Jul 14 2018 Fedora Release Engineering - 1.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Petr Pisar - 1.9-2 +- Remove install-info from scriptlets + +* Tue Mar 13 2018 Petr Pisar - 1.9-1 +- 1.9 bump + +* Fri Feb 09 2018 Fedora Release Engineering - 1.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Nov 09 2017 Petr Pisar - 1.8-2 +- Use upstream patch for POSIX mode +- Silence compiler warnings + +* Wed Nov 08 2017 Petr Pisar - 1.8-1 +- 1.8 bump +- License changed from GPLv2+ to (GPLv3+ and GFDL) +- Disable printing command failure in POSIX mode + +* Thu Aug 03 2017 Fedora Release Engineering - 1.7-54 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.7-53 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Feb 06 2017 Petr Pisar - 1.7-52 +- Package COPYING file as a license text (bug #1418528) + +* Wed Jan 11 2017 Petr Pisar - 1.7-51 +- Search clock_gettime() also in rt library (bug #1004416) + +* Wed Jan 11 2017 Petr Pisar - 1.7-50 +- Fix measuring time when a clock experiences a jump (bug #1004416) + +* Fri Feb 05 2016 Fedora Release Engineering - 1.7-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.7-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 21 2015 Till Maas - 1.7-47 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Mon Aug 18 2014 Fedora Release Engineering - 1.7-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.7-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.7-44 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.7-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Sep 06 2012 Petr Pisar - 1.7-42 +- Package AUTHORS and ChangeLog + +* Sat Jul 21 2012 Fedora Release Engineering - 1.7-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.7-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed May 11 2011 Petr Pisar - 1.7-39 +- Fix maximal RSS report (bug #702826) +- Clean spec file +- Recompute CPU usage at finer level (bug #527276) + +* Wed Feb 09 2011 Fedora Release Engineering - 1.7-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Aug 11 2009 Roman Rakus - 1.7-37 +- Don't print errors in post and preun sections (#515936) + +* Sun Jul 26 2009 Fedora Release Engineering - 1.7-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.7-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Sep 21 2008 Ville Skyttä - 1.7-34 +- Fix Patch:/%%patch0 mismatch. + Resolves: #463067 + +* Tue Mar 4 2008 Roman Rakus - 1.7-33 +- Added patch from JW (redhat@zacglen.com), less nonverbose output + +* Tue Feb 19 2008 Fedora Release Engineering - 1.7-32 +- Autorebuild for GCC 4.3 + +* Tue Jan 08 2008 Florian La Roche - 1.7-31 +- update url/license tags + +* Tue Aug 21 2007 Florian La Roche - 1.7-30 +- rebuild + +* Tue Feb 27 2007 Karsten Hopp 1.7-29 +- remove trailing dot from summary +- replace tabs with spaces +- replace PreReq with Requires(post)/Requires(preun) +- include license file in %%doc +- add smp flags +- use make install DESTDIR= + +* Mon Jan 22 2007 Florian La Roche +- add dist tag +- fix rhbz#223720 + +* Wed Jul 12 2006 Jesse Keating - 1.7-27.2.2 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 1.7-27.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.7-27.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Mar 02 2005 Karsten Hopp 1.7-27 +- build with gcc-4 + +* Wed Feb 09 2005 Karsten Hopp 1.7-26 +- update source URL +- rebuilt + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jun 17 2003 Florian La Roche +- rebuild + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Nov 19 2002 Tim Powers +- rebuild on all arches + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Wed Jun 19 2002 Florian La Roche +- do not strip apps, do not compress info page + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Mon Feb 25 2002 Elliot Lee +- Remove HAVE_WAIT3 hack, tried to replace it with a requirement for an +autoconf with the fixed test, didn't work, put in another less-bad hack +instead. + +* Wed Dec 05 2001 Tom Tromey +- Bump release, force HAVE_WAIT3 to be defined at build time + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Wed Jan 31 2001 Preston Brown +- prereq install-info (#24715) + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Thu Jun 29 2000 Preston Brown +- using / as the file manifesto has weird results. + +* Sun Jun 4 2000 Jeff Johnson +- FHS packaging. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 9) + +* Mon Aug 10 1998 Erik Troan +- buildrooted and defattr'd + +* Mon Apr 27 1998 Prospector System +- translations modified for de, fr, tr + +* Mon Oct 27 1997 Cristian Gafton +- fixed info handling + +* Thu Oct 23 1997 Cristian Gafton +- updated the spec file; added info file handling + +* Mon Jun 02 1997 Erik Troan +- built against glibc