diff --git a/diffutils-3.3.tar.xz b/diffutils-3.3.tar.xz new file mode 100644 index 0000000..a0e54a4 --- /dev/null +++ b/diffutils-3.3.tar.xz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..7d990ff --- /dev/null +++ b/diffutils-3.3.tar.xz.sig @@ -0,0 +1,19 @@ +-----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.5.tar.xz b/diffutils-3.5.tar.xz deleted file mode 100644 index 84acae2..0000000 --- a/diffutils-3.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 -size 1360996 diff --git a/diffutils-3.5.tar.xz.sig b/diffutils-3.5.tar.xz.sig deleted file mode 100644 index 19ff48d..0000000 --- a/diffutils-3.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIcBAABCgAGBQJXuT2mAAoJEH/Z/MsAC+7uECsP/0wVZOh74XKI0Y4XPxqhgKou -L/uFMgqpq2P9Uwr8jnJCr3xsKWCHYSYXOjmzbQ21wkqDWynT+NbLRcH4HLvO6vU3 -EWtoBor7UG0weTDanNfRBFjVLWsHsDWJj7VGMja9OAkXjpqo0f+iYHHIbJ+oKlIY -gzNqUdjGg8RpsvNapz4XuTsoUNDrTtVOy/k9xHUZCw/h1cZBVpaAU8MEE3MReab6 -pOn660BlVqT50vMd09FKRuTLktJ2LBFZ6x+xdPBJm5LFdUFqClbiNaNv+idhlvfB -GC8qjBr4WhuCtGpJKLFADTOZ8UOxcmx2sNz0ypiQrLT1UkTUtY3B0ADnzWuMEcwx -eaPNzdJhPExY64i7MA2vc2MxlRb7omj8kI+n0rBpiFKLMI3x3ZWf6Papg/acYbJg -0NHQkqdc82gH3vsp5DX/wNn+3TNwks9ziVt7Jervk7uQqWaDLrah3waBN3q5UWsk -HLAlkhb94Ahi+cNMk1oiNKqT+en3AhZ/7O6imKzTM8bTk27Ek7q3ThLfBeUKcp2O -j1aaPbaDGEL9pZZDCeuZCSdRZDGMY+spGNYRC4pmYCL9C2LsH5jtX5ob9gQsPHt3 -XFsi5l83i5N3amwzb2OdSTEwM0xgPX8TmcN435409gvz/VVmeSmx5jhHb9m8SLSk -SrDXEuf5yKX8J8HXVMgt -=e0eV ------END PGP SIGNATURE----- diff --git a/diffutils.changes b/diffutils.changes index 474f356..679dac6 100644 --- a/diffutils.changes +++ b/diffutils.changes @@ -1,24 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 22 20:34:19 UTC 2016 - astieger@suse.com - -- Diffutils 3.5: - * diff3 no longer malfunctions due to use-after-free - [bug introduced in 3.4] - * diff --color no longer colorizes when TERM=dumb - -------------------------------------------------------------------- -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 09ca69f..d64bc6e 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -17,7 +17,7 @@ Name: diffutils -Version: 3.5 +Version: 3.3 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,10 +39,9 @@ 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" @@ -54,14 +53,14 @@ make %{?_smp_mflags} V=1 make %{?_smp_mflags} check %install -%make_install -%find_lang %{name} +make DESTDIR=%{buildroot} install %{?_smp_mflags} +gzip -9 %{buildroot}%{_infodir}/%{name}.info %post -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %files %defattr(-,root,root) @@ -70,13 +69,10 @@ make %{?_smp_mflags} check %{_bindir}/diff %{_bindir}/diff3 %{_bindir}/sdiff -%{_infodir}/diffutils.info%{ext_info} +%{_infodir}/diffutils.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 new file mode 100644 index 0000000..e15505b --- /dev/null +++ b/gnulib-perl522.patch @@ -0,0 +1,15 @@ +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;