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.spec b/time.spec index a93a3e9..64301a1 100644 --- a/time.spec +++ b/time.spec @@ -1,7 +1,7 @@ Summary: A GNU utility for monitoring a program's use of system resources Name: time Version: 1.9 -Release: 1%{?dist} +Release: 2%{?dist} # src/time.c: GPLv3+ # COPYING: GPLv3 text # doc/time.texi: GFDL @@ -43,6 +43,8 @@ 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 BuildRequires: autoconf BuildRequires: automake BuildRequires: bash @@ -52,8 +54,6 @@ BuildRequires: make BuildRequires: texinfo # Tests BuildRequires: sed -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info %description The GNU time utility runs another program, collects information about @@ -63,6 +63,7 @@ the results. %prep %setup -q %patch0 -p1 +%patch1 -p1 autoreconf -fi %build @@ -71,22 +72,12 @@ autoreconf -fi %install make install DESTDIR=$RPM_BUILD_ROOT -# Remove info index, we update it in %%post script +# Remove info index, it's updated by file triggers rm -f $RPM_BUILD_ROOT%{_infodir}/dir %check make %{?_smp_mflags} check -%post -/sbin/install-info %{_infodir}/time.info.gz %{_infodir}/dir \ - --entry="* time: (time). GNU time Utility" >/dev/null 2>&1 || : - -%preun -if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/time.info.gz %{_infodir}/dir \ - --entry="* time: (time). GNU time Utility" >/dev/null 2>&1 || : -fi - %files %license COPYING %doc AUTHORS ChangeLog NEWS README @@ -94,6 +85,9 @@ fi %{_infodir}/time.info* %changelog +* 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