|
|
@@ -1,20 +1,18 @@
|
|
|
Summary: A GNU collection of diff utilities.
|
|
|
Summary(ja): GNU diff ユーティリティ集
|
|
|
Name: diffutils
|
|
|
-Version: 3.2
|
|
|
+Version: 3.3
|
|
|
Release: 1%{?_dist_release}
|
|
|
Group: Applications/Text
|
|
|
URL: http://www.gnu.org/software/diffutils/diffutils.html
|
|
|
License: GPLv3+
|
|
|
|
|
|
Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
|
|
|
-# For 'cmp -s', compare file sizes only if both non-zero (bug #563618).
|
|
|
Patch1: diffutils-cmp-s-empty.patch
|
|
|
-# Applied upstream gnulib fix for float test on ppc (bug #733536).
|
|
|
-Patch2: diffutils-ppc-float.patch
|
|
|
-# Fixed build failure.
|
|
|
-Patch3: diffutils-stdio-gets.patch
|
|
|
-Patch4: diffutils-3.2-i18n.patch
|
|
|
+Patch2: diffutils-mkdir_p.patch
|
|
|
+Patch3: diffutils-FILE....patch
|
|
|
+Patch4: diffutils-i18n.patch
|
|
|
+Patch5: diffutils-format-security.patch
|
|
|
|
|
|
Requires(post): /sbin/install-info
|
|
|
Requires(preun): /sbin/install-info
|
|
|
@@ -50,11 +48,25 @@ sdiff コマンドは2つのファイルを対話的にマージするのに使
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
+
|
|
|
+# For 'cmp -s', compare file sizes only if both non-zero (bug #563618).
|
|
|
%patch1 -p1 -b .cmp-s-empty
|
|
|
-%patch2 -p1 -b .ppc-float
|
|
|
-%patch3 -p1 -b .stdio-gets
|
|
|
+
|
|
|
+# Work around @mkdir_p@ build issue.
|
|
|
+%patch2 -p1 -b .mkdir_p
|
|
|
+
|
|
|
+# Fix --help output and man page (bug #1079076).
|
|
|
+%patch3 -p1 -b .FILE...
|
|
|
+
|
|
|
%patch4 -p1 -b .i18n
|
|
|
|
|
|
+# Applied upstream gnulib patch to avoid -Wformat-security warning
|
|
|
+# (bug #1037038).
|
|
|
+%patch5 -p1 -b .format-security
|
|
|
+
|
|
|
+# Run autoreconf for aarch64 support (bug #925256).
|
|
|
+autoreconf
|
|
|
+
|
|
|
%build
|
|
|
%configure
|
|
|
make PR_PROGRAM=%{_bindir}/pr
|
|
|
@@ -87,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jun 15 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3-1
|
|
|
+- new upstream release.
|
|
|
+- replaced patches.
|
|
|
+
|
|
|
* Thu Nov 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2-1
|
|
|
- new upstream reelase
|
|
|
- update patches
|
tomop