rpms/diffutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix bug #747969 again.

Browse Source
This commit is contained in:
Tim Waugh 2011-12-08 09:14:36 +00:00
parent dd743c5196
commit 19e3849f88
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
diffutils.spec
View File

@ -1,15 +1,15 @@
Summary: A GNU collection of diff utilities Summary: A GNU collection of diff utilities
Name: diffutils Name: diffutils
Version: 3.2 Version: 3.2
Release: 4%{?dist} Release: 5%{?dist}
Group: Applications/Text Group: Applications/Text
URL: http://www.gnu.org/software/diffutils/diffutils.html URL: http://www.gnu.org/software/diffutils/diffutils.html
Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
Patch1: diffutils-cmp-s-empty.patch Patch1: diffutils-cmp-s-empty.patch
Patch2: diffutils-ppc-float.patch Patch2: diffutils-ppc-float.patch
License: GPLv2+ License: GPLv2+
Requires(post): /sbin/install-info Requires(post): info
Requires(preun): /sbin/install-info Requires(preun): info
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: help2man BuildRequires: help2man
@ -49,18 +49,12 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
make check make check
%post %post
if [ -f %{_infodir}/diffutils.info.gz ]; then /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
/sbin/install-info %{_infodir}/diffutils.info.gz %{_infodir}/dir --entry="* diff: (diff). The GNU diff."
fi
exit 0
%preun %preun
if [ $1 = 0 ]; then if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/diffutils.info.gz %{_infodir}/dir --entry="* diff: (diff). The GNU diff." /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
# Also remove old name:
/sbin/install-info --delete %{_infodir}/diff.info.gz %{_infodir}/dir --entry="* diff: (diff). The GNU diff."
fi fi
exit 0
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -73,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/diffutils.info*gz %{_infodir}/diffutils.info*gz
%changelog %changelog
* Thu Dec 8 2011 Tim Waugh <twaugh@redhat.com> 3.2-5
- Fix bug #747969 again.
* Tue Nov 29 2011 Tim Waugh <twaugh@redhat.com> 3.2-4 * Tue Nov 29 2011 Tim Waugh <twaugh@redhat.com> 3.2-4
- Real fix for bug #747969: the diffutils info file changed name in - Real fix for bug #747969: the diffutils info file changed name in
3.1. Updated the scriptlets to install/remove the correct filename 3.1. Updated the scriptlets to install/remove the correct filename