From bbf81a62bf89d06da27903e167b46a0bfc7ae01ac91ecbdb7ef68e72922a30e8 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 5 Feb 2025 08:57:52 +0000 Subject: [PATCH] Accepting request 1243282 from home:AndreasStieger:branches:Base:System diffutils 3.11 OBS-URL: https://build.opensuse.org/request/show/1243282 OBS-URL: https://build.opensuse.org/package/show/Base:System/diffutils?expand=0&rev=77 --- diffutils-3.10.tar.xz | 3 --- diffutils-3.10.tar.xz.sig | 16 ---------------- diffutils-3.11.tar.xz | 3 +++ diffutils-3.11.tar.xz.sig | 16 ++++++++++++++++ diffutils.changes | 25 +++++++++++++++++++++++++ diffutils.spec | 14 ++++++++------ 6 files changed, 52 insertions(+), 25 deletions(-) delete mode 100644 diffutils-3.10.tar.xz delete mode 100644 diffutils-3.10.tar.xz.sig create mode 100644 diffutils-3.11.tar.xz create mode 100644 diffutils-3.11.tar.xz.sig diff --git a/diffutils-3.10.tar.xz b/diffutils-3.10.tar.xz deleted file mode 100644 index 330b56e..0000000 --- a/diffutils-3.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e -size 1624240 diff --git a/diffutils-3.10.tar.xz.sig b/diffutils-3.10.tar.xz.sig deleted file mode 100644 index c331714..0000000 --- a/diffutils-3.10.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmRp3HUACgkQf9n8ywAL -7u5uJA/+MAaQc6ovuxdBJomue6M+KkLLjUhlA5GILfVmV1Jr99P+ke8QlKmr5kOX -q9xxGJS+Rkp4coEqtuS+lKnhRoXq2OhYuO439zrm3BKOz9il9gR7yd2hN21zEQ3I -kW+TEqjswawOh9wpubCk/C5WozxSLSVu3nUefF3rzVDGwNtG73Z4etDpTQ0OXCYw -9Owy3F7Bmnxg0Ae/ETkZ/l95zPOAGUXGNrHYJ5KaxT5AJVbeNAgqlP2SWQmyBX8m -Ui6ffjvjn8tr99uAZUoD64FDehQ6xPIS7uknuQ9yUMa6SR4877Axhaekfy0pwR6j -lKSZI2PAJqufaVCnlM8ZQzDleHHqbKUD8cvbjW2upPg0Ow6Ppu/VFnFAgtREQnIP -Wd6WdRil7WVcglrurPGiykENrRG204ZGIEauZkUgsSB9ONZKgEt13jsu7PAQn+Qf -vGQf7/sk3+eRMIhkglPgJVDqV36GlYkxt0MDe2yJ3tsu7ZUzREYSQ8m8EcUdJ3h1 -xqFqaIpxxNzvyn7WtNeu3Ej1dD+lGTj8osLmGzSnCQ7eaFghtKJuUoTLnd0rcD9N -gW60pBb4DBEiPcAwqYmVmVwYKJ/afPf2qjfCDJDDm+nVHHPKeitzVNCnRVvnzJZc -55BV6ftNOHLV/H6Q7LDG9bF/WQR0HPu9UatdpYNUyggh45a3jlc= -=cXRh ------END PGP SIGNATURE----- diff --git a/diffutils-3.11.tar.xz b/diffutils-3.11.tar.xz new file mode 100644 index 0000000..e501cf9 --- /dev/null +++ b/diffutils-3.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a73ef05fe37dd585f7d87068e4a0639760419f810138bd75c61ddaa1f9e2131e +size 1926052 diff --git a/diffutils-3.11.tar.xz.sig b/diffutils-3.11.tar.xz.sig new file mode 100644 index 0000000..8c84f69 --- /dev/null +++ b/diffutils-3.11.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmegTMoACgkQf9n8ywAL +7u4/Hw/+Krffku9ToMb9l4rGs1s8cNFLs8xReYwCUe7MR1Wz7wi4UOhfWQWeuBEQ +SWQQBbvQg05H9AFSL/Bs8EgPNr0UqF413XdGMvf4s+lJ5OffOZkmOkdWGTUAa1iG +eTXpL19/dYGdAqhWcmLVyo8QZrr17KvcVwrFMi1b4obi3zqDFe/9sbpyYerDLuMa +jaN9Piu1lXrVdjQSfsgLunatD+SfNikaKXpD9IPh1009ghHBbeEa1MDoMF0wwXQs +DkclLmdo7/5fCy0f9owBDc8RgbzILCABE0Vq+gEm0mQgPj6eJRigQUowpmAVLTrg +mhJybOCEF/pkzvSgjFX2zMGuXNmPfUs5BLjvtNtCdTa+xo/6Hh1n/B02hP+Oe6mU +z1JO8WOrgtLddEMykR1T7/h/R/D2O22IWcazJ34RegI4A7RlxEoCIFYcVtExqDnN +UcOkNDPeBBMAi+exsgA7ellLsOOpsM/gfWGaQpz4Qa3VUk1HzgdTbSji6E/l6zrp +FWJfF1NmSDCe0P5ESVzCAIH7pUhUz2B+ood8XvA/7Cw/whyhP8l549D5BsKAHUJC +QkZDhtWKhZmrIP1nBt6ljopGyaldBu/47CMDPeoQHsJq9SGUDD7BdnFD5HKxFWdC +gZpaBXFDUdqc6lEwoC0RqXPVSs6cYH7ugK20kHp6snIfppOPecs= +=m3W8 +-----END PGP SIGNATURE----- diff --git a/diffutils.changes b/diffutils.changes index dcd7456..077b6bd 100644 --- a/diffutils.changes +++ b/diffutils.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Feb 5 08:38:23 UTC 2025 - Andreas Stieger + +- diffutils 3.11: + * quote file names more consistently in diagnostics + * diff now outputs more information when symbolic links differ + * diff's --ignore-case (-i) and --ignore-file-name-case options + now support multi-byte characters + * diff now supports multi-byte characters when treating white + space + * In options like --expand-tabs (-t), --ignore-space-change (-b) + and --ignore-tab-expansion (-E), diff now recognizes non-ASCII + space characters and counts columns for non-ASCII characters. + * cmp -bl no longer omits "M-" from bytes with the high bit set + in single-byte locales like en_US.iso8859-1 + * cmp -i N and -n N no longer fail merely because N is enormous. + * cmp -s no longer mishandles /proc files + * diff -E no longer mishandles some input lines containing '\a', + '\b', '\f', '\r', '\v', or '\0'. + * diff -ly no longer mishandles non-ASCII input. + * diff - A/B now works correctly when standard input is a + directory, by reading a file named B in that directory. + * diff no longer suffers from race conditions in some cases when + comparing files in a mutating file system + ------------------------------------------------------------------- Mon May 22 19:14:42 UTC 2023 - Andreas Stieger diff --git a/diffutils.spec b/diffutils.spec index 8c2d2e5..65d116a 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -2,6 +2,7 @@ # spec file for package diffutils # # Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 Andreas Stieger # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +18,7 @@ Name: diffutils -Version: 3.10 +Version: 3.11 Release: 0 Summary: GNU diff Utilities License: GFDL-1.2-only AND GPL-3.0-or-later @@ -41,9 +42,13 @@ make source code patches, for instance. %build %configure \ --with-packager="openSUSE" \ - --with-packager-bug-reports="http://bugs.opensuse.org/" + --with-packager-bug-reports="https://bugs.opensuse.org/" %make_build +%install +%make_install +%find_lang %{name} + %check %if 0%{?qemu_user_space_build} # Stack overflow tests are difficult to emulate, skip them @@ -55,10 +60,6 @@ echo 'int main() { return 77; }' > gnulib-tests/test-free.c %endif %make_build check -%install -%make_install -%find_lang %{name} - %files %license COPYING %doc AUTHORS NEWS README THANKS @@ -67,5 +68,6 @@ echo 'int main() { return 77; }' > gnulib-tests/test-free.c %{_mandir}/man1/*.1%{?ext_man} %files lang -f %{name}.lang +%license COPYING %changelog