|
|
@@ -1,18 +1,20 @@
|
|
|
Summary: A GNU collection of diff utilities.
|
|
|
Summary(ja): GNU diff ユーティリティ集
|
|
|
Name: diffutils
|
|
|
-Version: 2.8.1
|
|
|
-Release: 13%{?_dist_release}
|
|
|
+Version: 3.2
|
|
|
+Release: 1%{?_dist_release}
|
|
|
Group: Applications/Text
|
|
|
URL: http://www.gnu.org/software/diffutils/diffutils.html
|
|
|
-Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz
|
|
|
-Source1: cmp.1
|
|
|
-Source2: diff.1
|
|
|
-Source3: diff3.1
|
|
|
-Source4: sdiff.1
|
|
|
-Patch0: diffutils-2.8.4-i18n.patch
|
|
|
-Patch1: diffutils-2.8.1-badc.patch
|
|
|
-License: GPL
|
|
|
+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
|
|
|
|
|
|
Requires(post): /sbin/install-info
|
|
|
Requires(preun): /sbin/install-info
|
|
|
@@ -48,8 +50,10 @@ sdiff コマンドは2つのファイルを対話的にマージするのに使
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch0 -p1 -b .i18n
|
|
|
-%patch1 -p1 -b .badc
|
|
|
+%patch1 -p1 -b .cmp-s-empty
|
|
|
+%patch2 -p1 -b .ppc-float
|
|
|
+%patch3 -p1 -b .stdio-gets
|
|
|
+%patch4 -p1 -b .i18n
|
|
|
|
|
|
%build
|
|
|
%configure
|
|
|
@@ -57,28 +61,18 @@ make PR_PROGRAM=%{_bindir}/pr
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
-%makeinstall
|
|
|
-
|
|
|
-( cd $RPM_BUILD_ROOT
|
|
|
- gzip -9nf .%{_infodir}/diff*
|
|
|
- mkdir -p .%{_mandir}/man1
|
|
|
- for manpage in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4}
|
|
|
- do
|
|
|
- install -m 0644 ${manpage} .%{_mandir}/man1
|
|
|
- done
|
|
|
-)
|
|
|
+%__make DESTDIR=$RPM_BUILD_ROOT install
|
|
|
|
|
|
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
|
|
%find_lang %{name}
|
|
|
|
|
|
|
|
|
%post
|
|
|
-/sbin/install-info %{_infodir}/diff.info.gz %{_infodir}/dir --entry="* diff: (diff). The GNU diff."
|
|
|
-exit 0
|
|
|
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
|
|
|
|
|
|
%preun
|
|
|
if [ $1 = 0 ]; then
|
|
|
- /sbin/install-info --delete %{_infodir}/diff.info.gz %{_infodir}/dir --entry="* diff: (diff). The GNU diff."
|
|
|
+ /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
|
|
|
fi
|
|
|
|
|
|
%clean
|
|
|
@@ -86,13 +80,17 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
%defattr(-,root,root)
|
|
|
-%doc NEWS README
|
|
|
+%doc COPYING NEWS README
|
|
|
%{_bindir}/*
|
|
|
%{_mandir}/*/*
|
|
|
-%{_infodir}/diff.info*gz
|
|
|
+%{_infodir}/diffutils.info*gz
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Nov 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2-1
|
|
|
+- new upstream reelase
|
|
|
+- update patches
|
|
|
+
|
|
|
* Tue Mar 31 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 2.8.1-13
|
|
|
- spec in utf-8
|
|
|
|
daisuke