[packages/time] - updated to 1.8 (GPL v3 now) - updated info patch - removed outdated alpha patch
qboosh
qboosh at pld-linux.org
Sun Dec 10 19:24:08 CET 2017
commit f1e7b55047696a4d91f3192ed1ed46507f676c7a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Dec 10 19:25:20 2017 +0100
- updated to 1.8 (GPL v3 now)
- updated info patch
- removed outdated alpha patch
time-alpha.patch | 90 --------------------------------------------------------
time-info.patch | 31 ++++++++-----------
time.spec | 19 ++++++------
3 files changed, 21 insertions(+), 119 deletions(-)
---
diff --git a/time.spec b/time.spec
index f073c95..5001ba7 100644
--- a/time.spec
+++ b/time.spec
@@ -4,18 +4,17 @@ Summary(fr.UTF-8): Utilitaire time de GNU
Summary(pl.UTF-8): Narzędzie GNU do pomiaru czasu
Summary(tr.UTF-8): GNU zamanlama aracı
Name: time
-Version: 1.7
-Release: 28
-License: GPL v2+
+Version: 1.8
+Release: 1
+License: GPL v3+
Group: Applications/System
Source0: http://ftp.gnu.org/gnu/time/%{name}-%{version}.tar.gz
-# Source0-md5: e38d2b8b34b1ca259cf7b053caac32b3
+# Source0-md5: 4e00dcb8c3ab11c7cf5a0d698828ac96
Patch0: %{name}-info.patch
Patch1: %{name}-man.patch
-Patch2: %{name}-alpha.patch
URL: http://www.gnu.org/software/time/
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf >= 2.69
+BuildRequires: automake >= 1:1.11.1
BuildRequires: texinfo
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,11 +48,11 @@ yararlı olur.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure
@@ -66,7 +65,7 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man1
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install time.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p time.1 $RPM_BUILD_ROOT%{_mandir}/man1
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/time-alpha.patch b/time-alpha.patch
deleted file mode 100644
index 8f37ec1..0000000
--- a/time-alpha.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- time-1.7/resuse.h.orig Wed Jun 12 19:36:54 1996
-+++ time-1.7/resuse.h Fri Aug 8 13:49:13 2003
-@@ -36,7 +36,7 @@
- # include <sys/rusage.h>
- #else
- # define TV_MSEC tv_usec / 1000
--# if HAVE_WAIT3
-+# if HAVE_WAIT3 || HAVE_SYS_RESOURCE_H
- # include <sys/resource.h>
- # else
- /* Process resource usage structure. */
---- time-1.7/configure.in.orig Wed Jun 12 19:07:06 1996
-+++ time-1.7/configure.in Fri Aug 8 13:51:27 2003
-@@ -1,9 +1,6 @@
- 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_INIT(time, 1.7)
-+AM_INIT_AUTOMAKE
-
- AC_ARG_PROGRAM
-
-@@ -15,7 +12,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
-@@ -27,7 +27,54 @@
-
- dnl Checks for library functions.
- AC_FUNC_VPRINTF
--AC_FUNC_WAIT3
-+
-+AC_CACHE_CHECK([for wait3 that fills in rusage],
-+ [ac_cv_func_wait3_rusage],
-+[AC_RUN_IFELSE([AC_LANG_SOURCE(
-+[[#include <sys/types.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+#include <stdio.h>
-+/* HP-UX has wait3 but does not fill in rusage at all. */
-+int
-+main ()
-+{
-+ struct rusage r;
-+ int i;
-+ /* Use a field that we can force nonzero --
-+ voluntary context switches.
-+ For systems like NeXT and OSF/1 that don't set it,
-+ also use the system CPU time. And page faults (I/O) for Linux. */
-+ r.ru_nvcsw = 0;
-+ r.ru_stime.tv_sec = 999;
-+ r.ru_stime.tv_usec = 0;
-+ r.ru_majflt = r.ru_minflt = 0;
-+ switch (fork ())
-+ {
-+ case 0: /* Child. */
-+ sleep(1); /* Give up the CPU. */
-+ _exit(0);
-+ break;
-+ case -1: /* What can we do? */
-+ _exit(0);
-+ break;
-+ default: /* Parent. */
-+ wait3(&i, 0, &r);
-+ /* Avoid "text file busy" from rm on fast HP-UX machines. */
-+ sleep(2);
-+ exit (r.ru_nvcsw == 0 && r.ru_majflt == 0 && r.ru_minflt == 0
-+ && r.ru_stime.tv_sec == 999 && r.ru_stime.tv_usec == 0);
-+ }
-+}]])],
-+ [ac_cv_func_wait3_rusage=yes],
-+ [ac_cv_func_wait3_rusage=no],
-+ [ac_cv_func_wait3_rusage=no])])
-+if test $ac_cv_func_wait3_rusage = yes; then
-+ AC_DEFINE(HAVE_WAIT3, 1,
-+ [Define to 1 if you have the `wait3' system call.
-+ Deprecated, you should no longer depend upon `wait3'.])
-+fi
-+
- AC_CHECK_FUNCS(strerror)
-
- AC_MSG_CHECKING(for getpagesize)
diff --git a/time-info.patch b/time-info.patch
index 833d652..1de4331 100644
--- a/time-info.patch
+++ b/time-info.patch
@@ -1,21 +1,14 @@
-diff -Nru time-1.7/time.texi time-1.7.new/time.texi
---- time-1.7/time.texi Wed Jun 12 19:40:29 1996
-+++ time-1.7.new/time.texi Tue Jan 5 07:25:54 1999
-@@ -64,7 +64,17 @@
- by the Foundation.
- @end titlepage
+--- time-1.8/doc/time.texi.orig 2017-12-10 19:14:42.636694277 +0100
++++ time-1.8/doc/time.texi 2017-12-10 19:15:38.993360305 +0100
+@@ -26,9 +26,9 @@
+ @end copying
+
+
+- at dircategory Basics
++ at dircategory Shell utilities:
+ @direntry
+-* Time: (time). time
++* Time: (time). time
+ @end direntry
-+ at ifinfo
-+ at format
-+ at dircategory Miscellaneous:
-+ at direntry
-+* time: (time). GNU time Utility
-+ at end direntry
-+ at end format
-+ at end ifinfo
-+
- @node Top, , (dir), (dir)
-+ at top GNU time
- @ifinfo
- This file documents the the GNU @code{time} command for running programs
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/time.git/commitdiff/f1e7b55047696a4d91f3192ed1ed46507f676c7a
More information about the pld-cvs-commit
mailing list