From 7e079a5296c701659bddef106639da0479fec06083154407db5a7d1e25c675d9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 9 Aug 2016 17:11:28 +0000 Subject: [PATCH] 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 --- diffutils-3.3.tar.xz | 3 --- diffutils-3.3.tar.xz.sig | 19 ------------------- diffutils-3.4.tar.xz | 3 +++ diffutils-3.4.tar.xz.sig | 16 ++++++++++++++++ diffutils.changes | 13 +++++++++++++ diffutils.spec | 20 ++++++++++++-------- gnulib-perl522.patch | 15 --------------- 7 files changed, 44 insertions(+), 45 deletions(-) delete mode 100644 diffutils-3.3.tar.xz delete mode 100644 diffutils-3.3.tar.xz.sig create mode 100644 diffutils-3.4.tar.xz create mode 100644 diffutils-3.4.tar.xz.sig delete mode 100644 gnulib-perl522.patch diff --git a/diffutils-3.3.tar.xz b/diffutils-3.3.tar.xz deleted file mode 100644 index a0e54a4..0000000 --- a/diffutils-3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c -size 1197832 diff --git a/diffutils-3.3.tar.xz.sig b/diffutils-3.3.tar.xz.sig deleted file mode 100644 index 7d990ff..0000000 --- a/diffutils-3.3.tar.xz.sig +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.13 (GNU/Linux) - -iQJ8BAABCgBmBQJRT0IHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNTVEM0ZDNTAwQzgzNDQ4NkQxRUVBNjc3 -RkQ5RkNDQjAwMEJFRUVFAAoJEH/Z/MsAC+7uEJ0QAKLo6rArnNmg5XL/MTRQyzq4 -4FZgJiPsFnsB0Erd7WFlcLUho+w4R9IjgLdp8QoDwKvc8bnK19e4iJtdtgBEtwPj -IfjTslTTHA6OiUZvGOCh+5OFudMx00QUi0MRHE/zxbZzVui9TRGJzevdLT0xJnIF -vPwiz/cafUojIvWtABpsp+7hH8jadIkQYOBGdzG50fDl6ZudvUoNmnnWZ1+hqi3e -Q+Qu6xawe6LBvyR6ZeTdHVOJ+6pcDM4up65XZXJXQCB5Z7OBlcRB1mVHyHlh9HsE -Ycp2sukZkqrsB+746J9RQqWcMRSrper1rJv+oPsXqHW+rkWOKe+jI0TMo+sPhRmM -47YynCrBLsDgfovWwGHTJ5zds7mZdtqPhoE6Xgj1f7cel6n7kSsgIpXiSIiK/+yI -aBg6CMEl+VqHD8IQCZXkz/wVvzMyJQJF0hIWp/W7ynbYccdsnb/0gCkr13fgR50/ -iogjp9h07dMpt556ByfE2OVQcocjpnT+Nqws+n6RassWiD1+UNiF/6ND97D5m0pn -G9t/qLaxo+hkPM3OcoZ/Y8gP0O95gNZMHWWShDDX21nKx4Lo3ymOXY40n18T4WK2 -0eercgJNCepSAFwuenQn3NODQ/em2bNr54JscGeyn1h6sEqlNNrXz3ZgRfV7O9Y5 -9z0vaNoBjswNhlbaI/OF -=oSVM ------END PGP SIGNATURE----- diff --git a/diffutils-3.4.tar.xz b/diffutils-3.4.tar.xz new file mode 100644 index 0000000..f69290f --- /dev/null +++ b/diffutils-3.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2 +size 1358392 diff --git a/diffutils-3.4.tar.xz.sig b/diffutils-3.4.tar.xz.sig new file mode 100644 index 0000000..0cdda4f --- /dev/null +++ b/diffutils-3.4.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIcBAABCgAGBQJXqMIHAAoJEH/Z/MsAC+7uruAP/Ra6aYPHVTZJYk00d8jcEVHL +6BQxIHBx8BPCecs6BV6NxiyksnLK1IbBd8DdQ+Bpv3R0+6IaK6ZmnS3C6E4Xae8K +b8u+1wU/F09f6HSI51M8JqCDt6ZTTAsjkHZ+UIFEzij7hYd2gWY2dP7VRCsxCNB/ +s6HediMO6pPgRBZYsTA7m7lsdlADNGBt39zF62xpdObBAlfWUa/xwSYwpFr8G9bU +Eh05GBEsayGXqASlMsxD+Z9V8IXbLwNC89w1f4vAU5yImT21SXbNC0ThaAVHWunt +DyrXQjISkFRexZuqkFRxIqRlgjIFs41QfGnnMzOBAglOYDEfw9xhafadvsy53mYw +JdNrD8L1EzanSUrpDEFdSCuU2MfQwiqrzMy3W3cyc0wb7JCiHfXzVYWSkxvAiGUa +3p2Sy9E3Za0YwS6871I6lKanpK4g7MwBcqO/fXF8u+8S6FFcWpfeSquq7rYEjNFZ +3HBL0TE1Ep2wgJXrsrOABmF47+A1egAEEK/MWIepg6Rp/zUMyX5u6CaV5UJwAvqK +MIGyxHS4WvQPq94R7X1ofkoK9IYDudD6ZMFuD03iSNwksGNXDMusr1ud7Mz7ZRqd +jNLKdsstvbYDX3yoKVnSHwHWYLzw2VWWXdlvvnjx4j8tVz8WwFMCqFoe1Yzl/em3 +jMSzIz/eoRG8f25etDlg +=cOw7 +-----END PGP SIGNATURE----- diff --git a/diffutils.changes b/diffutils.changes index 679dac6..e623cf6 100644 --- a/diffutils.changes +++ b/diffutils.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Aug 9 09:03:53 UTC 2016 - mpluskal@suse.com + +- 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 + ------------------------------------------------------------------- Thu Feb 4 09:29:27 UTC 2016 - mpluskal@suse.com diff --git a/diffutils.spec b/diffutils.spec index d64bc6e..d812e19 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -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 diff --git a/gnulib-perl522.patch b/gnulib-perl522.patch deleted file mode 100644 index e15505b..0000000 --- a/gnulib-perl522.patch +++ /dev/null @@ -1,15 +0,0 @@ -Subject: http://comments.gmane.org/gmane.comp.lib.gnulib.bugs/35272 - -Index: grep-2.21/build-aux/update-copyright -=================================================================== ---- grep-2.21.orig/build-aux/update-copyright -+++ grep-2.21/build-aux/update-copyright -@@ -124,7 +124,7 @@ use strict; - use warnings; - - my $copyright_re = 'Copyright'; --my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)'; -+my $circle_c_re = '(?:\([cC]\)|@copyright\{}|©)'; - my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER}; - $holder ||= 'Free Software Foundation, Inc.'; - my $prefix_max = 5;