Accepting request 543004 from Base:System

OBS-URL: https://build.opensuse.org/request/show/543004
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/time?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2017-11-23 08:37:09 +00:00 committed by Git OBS Bridge
commit 235cd0023e
18 changed files with 189 additions and 568 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83eeec8df47e4c939a09b0147c34a36462bb2762f879596e9089b2817dcff7e2
size 92620

3
time-1.8.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a2f540155961a35ba9b84aec5e77e3ae36c74cecb4484db455960601b7a2e1b
size 546110

17
time-1.8.tar.gz.sig Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCgAGBQJaAm+cAAoJEAoRth02V7kBKxQP/0XdhVYOh9ABWE0Ngx/rY+hG
6z+/Zi/2KA4tdXCpMvefEY71N8tZ3j6iIjIPCoDfJDEuPSGR/s8ovS/b8BwVeITe
oOXv9grtcxk2K5nkQnEUuyFR0nIRPPWmrMvhtUEJXODYjgEGT+okcYnlM5ikQwHa
aAA49EJD7CsAq3YjkZvD1votUBL8jXL2g/WxG9Yj9Kvf8VUEUinF+9oFUCYoOTBq
j4085TZUaijtOY7RZ3aY9a/VpJWkWsI2mslHO2NSI2KSpkpVvHDCXQTVxpg4c5cE
chakN/NMoa4d8qHzdXo26lYLXVJfk08r9d43+Oe+oUkcW5PnqzI2ZRWBGgPXNw3S
0ax5CDq9MUw53nlBOD6oi1uJ4gkYaMjQ5sdNiQak72S2ehsv7xlbGa1ol0IQROdz
3xADyWv0FWe3kzT9lWoSijXaRhuyc2mmvHDF8xe1Ze/L7v66Edz8OAxFA0/VFdYm
i2NmdFrLYfcX476ffD6yQqcKK01jAar8uJm31OVO5S4LlhgxQKs9NwGUgai88jSQ
xixYFhAPeYvei1f4p3qG20PtxKsBQBOk2nxuOg7UHFA70cse20yH+GQzShSHbTyq
3UIWYTwv5Qx31tPxMCpAZkBfNQJ1F4iJ1Esh9E3AjlYCbrKC898zq7EUsG0CubKk
LCJ0TLbZzsjokL9PEDZI
=6jLS
-----END PGP SIGNATURE-----

View File

@ -1,26 +0,0 @@
---
resuse.h | 4 ++++
1 file changed, 4 insertions(+)
Index: time-1.7/resuse.h
===================================================================
--- time-1.7.orig/resuse.h
+++ time-1.7/resuse.h
@@ -39,6 +39,9 @@ struct timeval
# if HAVE_WAIT3
# include <sys/resource.h>
# else
+# if defined(__linux__) && defined(__alpha__)
+# include <sys/resource.h>
+# else
/* Process resource usage structure. */
struct rusage
{
@@ -49,6 +52,7 @@ struct rusage
ru_oublock, ru_msgsnd, ru_msgrcv, ru_nsignals,
ru_nvcsw, ru_nivcsw;
};
+# endif
# endif
#endif

View File

@ -1,26 +0,0 @@
Description: Update bug reporting address.
* Reported by Faheem Mitha.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542469
Author: Bob Proulx
--- time-1.7.orig/README
+++ time-1.7/README
@@ -8,6 +8,6 @@
See the file INSTALL for compilation and installation instructions.
Mail suggestions and bug reports for GNU time to
-bug-gnu-utils@prep.ai.mit.edu. Please include the version of
+bug-gnu-utils@gnu.org. Please include the version of
`time', which you can get by running `time --version', and the
operating system and C compiler you used.
--- time-1.7.orig/time.texi
+++ time-1.7/time.texi
@@ -137,7 +143,7 @@
@end example
Mail suggestions and bug reports for GNU @code{time} to
-@code{bug-gnu-utils@@prep.ai.mit.edu}. Please include the version of
+@code{bug-gnu-utils@@gnu.org}. Please include the version of
@code{time}, which you can get by running @samp{time --version}, and the
operating system and C compiler you used.

View File

@ -1,28 +0,0 @@
Description: Update configure.in file to current format for autoconf version 2.x.
* Modernize the configure.in file to current autoconf style.
* No need to rename to configure.ac since configure.in still works fine.
Author: Bob Proulx
--- time-1.7.orig/configure.in
+++ time-1.7/configure.in
@@ -1,11 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(time.c)
-VERSION=1.7
-AC_SUBST(VERSION)
-PACKAGE=time
-AC_SUBST(PACKAGE)
-AC_ARG_PROGRAM
+AC_INIT([time],[1.7])
+AM_INIT_AUTOMAKE([-Wall])
dnl Checks for programs.
AC_PROG_CC
@@ -39,4 +35,5 @@
AC_MSG_RESULT($have_gp)
test $have_gp = yes && AC_DEFINE(HAVE_GETPAGESIZE)
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT

View File

@ -1,20 +0,0 @@
Description: Add a directory entry to the info page.
This patch seems to have always been part of the package but its
origin is undocumented.
Author: Debian
--- time-1.7.orig/time.texi
+++ time-1.7/time.texi
@@ -11,6 +11,12 @@
@finalout
@end iftex
+@dircategory Individual utilities
+@direntry
+* time: (time). Run programs and summarize
+ system resource usage.
+@end direntry
+
@ifinfo
This file documents the the GNU @code{time} command for running programs
and summarizing the system resources they use.

View File

@ -1,119 +0,0 @@
Description: Fix info navigation structure
In the original when using the standalone 'info' program pressing
spacebar does not navigate through the pages. This patch
restructures the node navigation somewhat to enable this to happen.
Reported by Russ Allbery.
Author: Bob Proulx
--- a/time.texi
+++ b/time.texi
@@ -70,7 +70,10 @@
by the Foundation.
@end titlepage
-@node Top, , (dir), (dir)
+@contents
+
+@node Top
+@top The GNU @code{time} Command
@ifinfo
This file documents the the GNU @code{time} command for running programs
@@ -80,30 +83,12 @@
@menu
* Resource Measurement:: Measuring program resource use.
-
- --- The Detailed Node Listing ---
-
-Measuring Program Resource Use
-
-* Setting Format:: Selecting the information reported by @code{time}.
-* Format String:: The information @code{time} can report.
-* Redirecting:: Writing the information to a file.
-* Examples:: Examples of using @code{time}.
-* Accuracy:: Limitations on the accuracy of @code{time} output.
-* Invoking time:: Summary of the options to the @code{time} command.
-
-The Format String
-
-* Time Resources::
-* Memory Resources::
-* I/O Resources::
-* Command Info::
+* Concept index:: Index of concepts.
@end menu
-@node Resource Measurement, , , Top
+@node Resource Measurement
@chapter Measuring Program Resource Use
-@findex time
-@kindex time
+@cindex time invocation
@pindex time
@pindex measurement
@@ -125,7 +110,7 @@
time @r{[}option@dots{}@r{]} @var{command} @r{[}@var{arg}@dots{}@r{]}
@end example
-@kindex resources
+@cindex resource specifiers
@code{time} runs the program @var{command}, with any given arguments
@var{arg}@dots{}. When @var{command} finishes, @code{time} displays
information about resources used by @var{command}.
@@ -197,7 +182,7 @@
@item -v
@itemx --verbose
-@cindex format
+@cindex verbose format
Use the built-in verbose format, which displays each available piece of
information on the program's resource use on its own line, with an
English description of its meaning.
@@ -207,7 +192,6 @@
@section The Format String
@cindex format
-@kindex resource
The @dfn{format string} controls the contents of the @code{time} output.
It consists of @dfn{resource specifiers} and @dfn{escapes}, interspersed
with plain text.
@@ -450,7 +434,7 @@
@node Accuracy
@section Accuracy
-@kindex error (in measurement)
+@cindex error (in measurement)
The elapsed time is not collected atomically with the execution of the
program; as a result, in bizarre circumstances (if the @code{time}
@@ -489,7 +473,7 @@
time @r{[}option@dots{}@r{]} @var{command} @r{[}@var{arg}@dots{}@r{]}
@end example
-@kindex resources
+@cindex resources
@code{time} runs the program @var{command}, with any given arguments
@var{arg}@dots{}. When @var{command} finishes, @code{time} displays
information about resources used by @var{command} (on the standard error
@@ -524,7 +508,7 @@
@item -v
@itemx --verbose
-@cindex format
+@cindex verbose option
Use the built-in verbose format.
@item -V
@@ -533,5 +517,9 @@
Print the version number of @code{time} and exit.
@end table
-@contents
+@node Concept index
+@unnumbered Concept index
+
+@printindex cp
+
@bye

View File

@ -1,23 +0,0 @@
Subject: Adjust non-normal exit code
* Introduced in Debian time version 1.7-16
* time.c: When time exits in a non-normal way, return 128 plus the
number of the signal which caused time to stop or abort. Thanks to
Steve Greenland and Herbert Xu for some clarification in this matter.
Author: Dirk Eddelbuettel
--- time-1.7.orig/time.c
+++ time-1.7/time.c
@@ -664,9 +664,9 @@
fflush (outfp);
if (WIFSTOPPED (res.waitstatus))
- exit (WSTOPSIG (res.waitstatus));
+ exit (WSTOPSIG (res.waitstatus) + 128);
else if (WIFSIGNALED (res.waitstatus))
- exit (WTERMSIG (res.waitstatus));
+ exit (WTERMSIG (res.waitstatus) + 128);
else if (WIFEXITED (res.waitstatus))
exit (WEXITSTATUS (res.waitstatus));
}

View File

@ -1,85 +0,0 @@
Description: Adds -q,--quiet functionality.
Requested by Adam Heath.
Author: Dirk Eddelbuettel
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=56853
--- time-1.7.orig/time.texi
+++ time-1.7/time.texi
@@ -185,6 +185,10 @@
sys %S
@end example
+@item -q
+@itemx --quiet
+Suppress non-zero error code from the executed program.
+
@item -v
@itemx --verbose
@cindex format
--- time-1.7.orig/time.c
+++ time-1.7/time.c
@@ -147,6 +147,10 @@
NULL
};
+
+/* If true, do not show the exit message */
+static boolean quiet;
+
/* If true, show an English description next to each statistic. */
static boolean verbose;
@@ -172,6 +176,7 @@
{"help", no_argument, NULL, 'h'},
{"output-file", required_argument, NULL, 'o'},
{"portability", no_argument, NULL, 'p'},
+ {"quiet", no_argument,NULL, 'q'},
{"verbose", no_argument, NULL, 'v'},
{"version", no_argument, NULL, 'V'},
{NULL, no_argument, NULL, 0}
@@ -337,7 +342,8 @@
else if (WIFSIGNALED (resp->waitstatus))
fprintf (fp, "Command terminated by signal %d\n",
WTERMSIG (resp->waitstatus));
- else if (WIFEXITED (resp->waitstatus) && WEXITSTATUS (resp->waitstatus))
+ else if (WIFEXITED (resp->waitstatus) && WEXITSTATUS (resp->waitstatus)
+ && !quiet)
fprintf (fp, "Command exited with non-zero status %d\n",
WEXITSTATUS (resp->waitstatus));
}
@@ -545,6 +551,7 @@
char *format; /* Format found in environment. */
/* Initialize the option flags. */
+ quiet = false;
verbose = false;
outfile = NULL;
outfp = stderr;
@@ -558,7 +565,7 @@
if (format)
output_format = format;
- while ((optc = getopt_long (argc, argv, "+af:o:pvV", longopts, (int *) 0))
+ while ((optc = getopt_long (argc, argv, "+af:o:pqvV", longopts, (int *) 0))
!= EOF)
{
switch (optc)
@@ -577,6 +584,9 @@
case 'p':
output_format = posix_format;
break;
+ case 'q':
+ quiet = true;
+ break;
case 'v':
verbose = true;
break;
@@ -679,7 +689,7 @@
fprintf (stream, "\
Usage: %s [-apvV] [-f format] [-o file] [--append] [--verbose]\n\
[--portability] [--format=format] [--output=file] [--version]\n\
- [--help] command [arg...]\n",
+ [--quiet] [--help] command [arg...]\n",
program_name);
exit (status);
}

View File

@ -1,41 +0,0 @@
Subject: struct rusage and sys/resource.h portability fix
Author: Dirk Eddelbuettel
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=144819
--- time-1.7.orig/resuse.h
+++ time-1.7/resuse.h
@@ -38,22 +38,11 @@
#else
# define TV_MSEC tv_usec / 1000
# define TV_USEC tv_usec
-# if HAVE_WAIT3
+# if HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
# else
# if defined(__linux__) && defined(__alpha__)
# include <sys/resource.h>
-# else
-/* Process resource usage structure. */
-struct rusage
-{
- struct timeval ru_utime; /* User time used. */
- struct timeval ru_stime; /* System time used. */
- int ru_maxrss, ru_ixrss, ru_idrss, ru_isrss,
- ru_minflt, ru_majflt, ru_nswap, ru_inblock,
- ru_oublock, ru_msgsnd, ru_msgrcv, ru_nsignals,
- ru_nvcsw, ru_nivcsw;
-};
# endif
# endif
#endif
--- time-1.7.orig/configure.in
+++ time-1.7/configure.in
@@ -15,7 +15,7 @@
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h)
+AC_CHECK_HEADERS(unistd.h string.h sys/rusage.h sys/resource.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

View File

@ -1,72 +0,0 @@
From 0d743a7d946fe176a07baf2586a6af0e867fd89c Mon Sep 17 00:00:00 2001
From: H.J. Lu <hongjiu.lu@intel.com>
Date: Wed, 11 May 2011 16:19:55 +0200
Subject: [PATCH] Recompute CPU usage at microsecond level
If job finishes quickly, miliseconds arithmetic rounds to zero. If
that happens, recalculate CPU usage ratio with microsecond accuracy
to raise chance to get non-zero values.
---
resuse.h | 2 ++
time.c | 15 +++++++++++++++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/resuse.h b/resuse.h
index 992143f..7a3ee66 100644
--- a/resuse.h
+++ b/resuse.h
@@ -33,9 +33,11 @@ struct timeval
#if HAVE_SYS_RUSAGE_H
/* This rusage structure measures nanoseconds instead of microseconds. */
# define TV_MSEC tv_nsec / 1000000
+# define TV_USEC tv_nsec / 1000
# include <sys/rusage.h>
#else
# define TV_MSEC tv_usec / 1000
+# define TV_USEC tv_usec
# if HAVE_WAIT3
# include <sys/resource.h>
# else
diff --git a/time.c b/time.c
index 43aec0b..96cfdde 100644
--- a/time.c
+++ b/time.c
@@ -326,6 +326,8 @@ summarize (fp, fmt, command, resp)
{
unsigned long r; /* Elapsed real milliseconds. */
unsigned long v; /* Elapsed virtual (CPU) milliseconds. */
+ unsigned long ru; /* Elapsed real microseconds. */
+ unsigned long vu; /* Elapsed virtual (CPU) microseconds. */
if (verbose)
{
@@ -350,6 +352,17 @@ summarize (fp, fmt, command, resp)
v = resp->ru.ru_utime.tv_sec * 1000 + resp->ru.ru_utime.TV_MSEC +
resp->ru.ru_stime.tv_sec * 1000 + resp->ru.ru_stime.TV_MSEC;
+ if (r == 0 && v == 0)
+ {
+ ru = resp->elapsed.tv_usec;
+ vu = resp->ru.ru_utime.TV_USEC + resp->ru.ru_stime.TV_USEC;
+ }
+ else
+ {
+ ru = 0;
+ vu = 0;
+ }
+
while (*fmt)
{
switch (*fmt)
@@ -408,6 +421,8 @@ summarize (fp, fmt, command, resp)
/* % cpu is (total cpu time)/(elapsed time). */
if (r > 0)
fprintf (fp, "%lu%%", (v * 100 / r));
+ else if (ru > 0)
+ fprintf (fp, "%lu%%", (vu * 100 / ru));
else
fprintf (fp, "?%%");
break;
--
1.7.4.4

View File

@ -1,32 +0,0 @@
From ad24a929bdcc15abae14a64ea21b821bcd8cb030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 11 May 2011 15:19:11 +0200
Subject: [PATCH] ru_maxrss is in kilobytes on Linux
Since 2.6.32 Linux returns ru_maxrss in kilobytes. Not in pages.
See http://lists.gnu.org/archive/html/bug-gnu-utils/2008-12/msg00047.html
for discussion.
---
time.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/time.c b/time.c
index d15fee4..43aec0b 100644
--- a/time.c
+++ b/time.c
@@ -395,7 +395,11 @@ summarize (fp, fmt, command, resp)
ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v));
break;
case 'M': /* Maximum resident set size. */
+#ifdef __linux__
+ fprintf (fp, "%ld", resp->ru.ru_maxrss);
+#else
fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss));
+#endif
break;
case 'O': /* Outputs. */
fprintf (fp, "%ld", resp->ru.ru_oublock);
--
1.7.4.4

View File

@ -1,19 +0,0 @@
--- time-1.7/time.c.verbose Fri Jun 14 05:38:21 1996
+++ time-1.7/time.c Sun Nov 4 16:21:09 2001
@@ -327,6 +327,8 @@
unsigned long r; /* Elapsed real milliseconds. */
unsigned long v; /* Elapsed virtual (CPU) milliseconds. */
+ if (verbose)
+ {
if (WIFSTOPPED (resp->waitstatus))
fprintf (fp, "Command stopped by signal %d\n",
WSTOPSIG (resp->waitstatus));
@@ -336,6 +338,7 @@
else if (WIFEXITED (resp->waitstatus) && WEXITSTATUS (resp->waitstatus))
fprintf (fp, "Command exited with non-zero status %d\n",
WEXITSTATUS (resp->waitstatus));
+ }
/* Convert all times to milliseconds. Occasionally, one of these values
comes out as zero. Dividing by zero causes problems, so we first

View File

@ -1,15 +0,0 @@
Index: time-1.7/COPYING
===================================================================
--- time-1.7.orig/COPYING
+++ time-1.7/COPYING
@@ -1,8 +1,8 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Sat Nov 18 20:41:15 UTC 2017 - astieger@suse.com
- time 1.8:
* license changed to GPL-3.0+
- incorporate functionality previously carried as patches:
* -q/--quiet option to suppresses abnormal program terminal
(non-exit codes or signals).
Drop time-debian-quiet.patch
Drop time-fedora-verbose.patch
* use the following exit codes (same as GNU coreutils' env):
125 = Wrong usage or internal error prior to exec attempt.
126 = Program located, but not usable.
127 = Could not find program to exec.
* exit with code '128 + Signal number' when the program
is terminated by a signal.
Drop time-debian-non-normal-exit.patch
* report MAX-RSS values correctly on modern systems
Drop time-fedora-ru_maxrss-is-in-kilobytes-on-Linux.patch
Drop time-fedora-Recompute-CPU-usage-at-microsecond-level.patch
* Use gnulib modules and build infrastructure.
* New tests infrastructure (make check).
- drop unneeded patches:
* time-debian-bug-address.patch
* time-alpha.patch
* time-debian-configure.patch
* time-debian-info-direntry.patch
* time-debian-info-nav.patch
* time-debian-rusage-portability.patch
* time-fsf-address.patch
- add upstream keyring and verify source signature
-------------------------------------------------------------------
Fri May 23 19:14:12 CEST 2014 - sbrabec@suse.cz

122
time.keyring Normal file
View File

@ -0,0 +1,122 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1
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
=Q/GF
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
#
# spec file for package time
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,51 +17,18 @@
Name: time
Version: 1.7
Version: 1.8
Release: 0
Summary: Run Programs And Summarize System Resource Usage
License: GPL-2.0+
License: GPL-3.0+
Group: System/Base
Url: http://www.gnu.org/software/time/
Source: %{name}-%{version}.tar.bz2
Source: http://ftp.gnu.org/gnu/time/%{name}-%{version}.tar.gz
Source1: %{name}.rpmlintrc
# Sync with:
# Debian version: 1.7-24, patch naming: s/^/time-debian-/
# Fedora version: 1.7-44, patch naming: s/^time-1.7/^time-fedora/
# PATCH-FIX-OPENSUSE time-alpha.patch ro@suse.de -- Fix compilation on Alpha.
Patch1: time-alpha.patch
# PATCH-FIX-OPENSUSE time-fsf-address.patch sbrabec@suse.cz -- Fix FSF address.
Patch2: time-fsf-address.patch
# Patch10 time-fedora-destdir.patch not applied, use Debian patch and autoreconf instead
# PATCH-FEATURE-FEDORA time-fedora-verbose.patch sbrabec@suse.cz -- Roman Rakus <rrakus@redhat.cz> - 1.7-33 - Added patch from JW (redhat@zacglen.com), less nonverbose output.
Patch11: time-fedora-verbose.patch
# PATCH-FIX-FEDORA time-fedora-ru_maxrss-is-in-kilobytes-on-Linux.patch Redhat#702826 bnc#836049 sbrabec@suse.cz -- Petr Pisar <ppisar@redhat.com> - 1.7-39 - Fix maximal RSS report.
Patch12: time-fedora-ru_maxrss-is-in-kilobytes-on-Linux.patch
# Bug Redhat#527276 Recompute CPU usage at microsecond level
# PATCH-FEATURE-FEDORA time-fedora-Recompute-CPU-usage-at-microsecond-level.patch Redhat#527276 sbrabec@suse.cz -- H.J. Lu <hongjiu.lu@intel.com> - Switch to microsecond accuracy if miliseconds arithmetic rounds to zero.
Patch13: time-fedora-Recompute-CPU-usage-at-microsecond-level.patch
# PATCH-FIX-DEBIAN time-debian-non-normal-exit.patch sbrabec@suse.cz -- When time exits in a non-normal way, return 128 plus the number of the signal which caused time to stop or abort.
Patch20: time-debian-non-normal-exit.patch
# Patch21 time-debian-ru_maxrss.patch not applied, Fedora had it earlier.
# PATCH-FIX-DEBIAN time-debian-rusage-portability.patch Debian#144819 sbrabec@suse.cz -- struct rusage and sys/resource.h portability fix.
Patch22: time-debian-rusage-portability.patch
# PATCH-FEATURE-DEBIAN time-debian-quiet.patch Debian#56853 sbrabec@suse.cz -- Add -q,--quiet functionality.
Patch23: time-debian-quiet.patch
# PATCH-FIX-DEBIAN time-debian-bug-address.patch Debian#542469 sbrabec@suse.cz -- Update bug reporting address.
Patch24: time-debian-bug-address.patch
# PATCH-FIX-DEBIAN time-debian-configure.patch sbrabec@suse.cz -- Modernize the configure.in file to current autoconf style.
Patch25: time-debian-configure.patch
# PATCH-FEATURE-DEBIAN time-debian-info-direntry.patch sbrabec@suse.cz -- Add a directory entry to the info page.
Patch26: time-debian-info-direntry.patch
# PATCH-FEATURE-DEBIAN time-debian-info-nav.patch sbrabec@suse.cz -- Fix info navigation structure. Reported by Russ Allbery. Author: Bob Proulx.
Patch27: time-debian-info-nav.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: makeinfo
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %install_info_prereq
# Split-provides for openSUSE <= 12.3 and SLE <= 11:
Provides: util-linux:/usr/bin/time
Source2: http://ftp.gnu.org/gnu/time/%{name}-%{version}.tar.gz.sig
Source3: https://savannah.gnu.org/people/viewgpg.php?user_id=94790#/%{name}.keyring
Requires(post): %{install_info_prereq}
Requires(preun): %{install_info_prereq}
%description
The "time" command runs another program, then displays information
@ -70,38 +37,27 @@ while the program was running.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch20 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%build
autoreconf -f -i
%configure
make %{?_smp_mflags}
%install
%makeinstall
%make_install
install -d %{buildroot}%{_mandir}/man1
%check
make %{?_smp_mflags} check
%post
%install_info --entry="* time: (time). summarizing used system resources" --info-dir="%_infodir" "%_infodir/time.info.gz"
%install_info --entry="* time: (time). summarizing used system resources" --info-dir="%{_infodir}" "%{_infodir}/time.info.gz"
%postun
%install_info_delete --info-dir="%_infodir" "%_infodir/time.info.gz"
%install_info_delete --info-dir="%{_infodir}" "%{_infodir}/time.info.gz"
%files
%defattr(-,root,root)
%doc AUTHORS COPYING NEWS README
%{_bindir}/time
%{_infodir}/time.info*.gz
%{_infodir}/time.info*%{ext_info}
%changelog