forked from pool/diffutils
Accepting request 417947 from home:pluskalm:branches:Base:System
- Update to version 3.4 * diff accepts two new options --color and --palette to generate and configure colored output. --color takes an optional argument specifying when to colorize a line: --color=always, --color=auto, --color=never. --palette is used to configure which colors are used. * many bugfixes - New -lang subpackage - Drop no longer needed gnulib-perl522.patch OBS-URL: https://build.opensuse.org/request/show/417947 OBS-URL: https://build.opensuse.org/package/show/Base:System/diffutils?expand=0&rev=38
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: diffutils
|
||||
Version: 3.3
|
||||
Version: 3.4
|
||||
Release: 0
|
||||
Summary: GNU diff Utilities
|
||||
License: GFDL-1.2 and GPL-3.0+
|
||||
@@ -27,10 +27,10 @@ Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
|
||||
Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
|
||||
# http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=diffutils
|
||||
Source2: %{name}.keyring
|
||||
Patch0: gnulib-perl522.patch
|
||||
BuildRequires: xz
|
||||
Requires(pre): %{install_info_prereq}
|
||||
Requires(preun): %{install_info_prereq}
|
||||
Recommends: %{name}-lang = %{version}
|
||||
Provides: diff = %{version}
|
||||
Obsoletes: diff < %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@@ -39,9 +39,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
The GNU diff utilities find differences between files. diff is used to
|
||||
make source code patches, for instance.
|
||||
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags} -fPIE"
|
||||
@@ -53,14 +54,14 @@ make %{?_smp_mflags} V=1
|
||||
make %{?_smp_mflags} check
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
gzip -9 %{buildroot}%{_infodir}/%{name}.info
|
||||
%make_install
|
||||
%find_lang %{name}
|
||||
|
||||
%post
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
|
||||
|
||||
%preun
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@@ -69,10 +70,13 @@ gzip -9 %{buildroot}%{_infodir}/%{name}.info
|
||||
%{_bindir}/diff
|
||||
%{_bindir}/diff3
|
||||
%{_bindir}/sdiff
|
||||
%{_infodir}/diffutils.info.*
|
||||
%{_infodir}/diffutils.info%{ext_info}
|
||||
%{_mandir}/man1/cmp.1%{ext_man}
|
||||
%{_mandir}/man1/diff.1%{ext_man}
|
||||
%{_mandir}/man1/diff3.1%{ext_man}
|
||||
%{_mandir}/man1/sdiff.1%{ext_man}
|
||||
|
||||
%files lang -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
%changelog
|
||||
|
Reference in New Issue
Block a user