From a08c8d7b084249735999de392a7e56e40ab88702bfad2e2b0f24016db934dd8d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 16 Aug 2020 00:39:09 +0000 Subject: [PATCH] - update to 0.4.2: * Fixed a packaging issue * New patchview mode with accompanying scripts. * New grepdiff option --only-match. * New filterdiff option --remove-timestamps. * Assorted other fixes and improvements. - remove patchutils-0.2.30-tailsyntax.diff: obsolete OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=22 --- patchutils-0.2.30-tailsyntax.diff | 11 ----------- patchutils-0.3.4.tar.xz | 3 --- patchutils-0.3.4.tar.xz.sig | Bin 287 -> 0 bytes patchutils-0.4.2.tar.xz | 3 +++ patchutils-0.4.2.tar.xz.sig | 11 +++++++++++ patchutils.changes | 11 +++++++++++ patchutils.spec | 9 ++++----- 7 files changed, 29 insertions(+), 19 deletions(-) delete mode 100644 patchutils-0.2.30-tailsyntax.diff delete mode 100644 patchutils-0.3.4.tar.xz delete mode 100644 patchutils-0.3.4.tar.xz.sig create mode 100644 patchutils-0.4.2.tar.xz create mode 100644 patchutils-0.4.2.tar.xz.sig diff --git a/patchutils-0.2.30-tailsyntax.diff b/patchutils-0.2.30-tailsyntax.diff deleted file mode 100644 index fd7043d..0000000 --- a/patchutils-0.2.30-tailsyntax.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- patchutils-0.2.29/tests/copy1/run-test -+++ patchutils-0.2.29/tests/copy1/run-test -@@ -16,7 +16,7 @@ - ${DIFF} -u dir/file.orig dir/file > patch1 - ${INTERDIFF} /dev/null patch1 2>errors > patch-1 || exit 1 - [ -s errors ] && exit 1 --tail -1 patch-1 > lastline -+tail -n 1 patch-1 > lastline - cat << EOF | cmp - lastline || exit 1 - --- - EOF diff --git a/patchutils-0.3.4.tar.xz b/patchutils-0.3.4.tar.xz deleted file mode 100644 index dd8ad61..0000000 --- a/patchutils-0.3.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf55d4db83ead41188f5b6be16f60f6b76a87d5db1c42f5459d596e81dabe876 -size 166400 diff --git a/patchutils-0.3.4.tar.xz.sig b/patchutils-0.3.4.tar.xz.sig deleted file mode 100644 index 608ebfc2651a520c2d3dec00506277487a29cbd6092447b002815140d5db2e40..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|L0UQJX0SEvF1p-wyRbK!K2@to!4F{Bw>SKi}2mT@Q4bQfJZ_x=_P%XkH z0$14*hToZb^cpuZ&ctBe)?V@HZ%EAvlsAHVa$@S-Bs@v$8+L1!;*rf44%t3pzH?kn z6R6<%7NKr9TO2Z3R=kSf#*B7Cnxs@sVRV5EHY5aD34<^b;B#46A#@%olUyLz68=rlE)vCefkjWs_nIk;zfMMoIIi&NeOe--%LZxw$ zn=2;BLDyADm@|ukPOyz@xQ1|*%TIles}qkiPlUoro-D0bkJ5hd6uCt6Ed4A~N(Zds lUE$;oYM=DD+0qLG(|=jm-_qfG_@=c!f2RWpyCqcV!7_S=g9!it diff --git a/patchutils-0.4.2.tar.xz b/patchutils-0.4.2.tar.xz new file mode 100644 index 0000000..152e850 --- /dev/null +++ b/patchutils-0.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8875b0965fe33de62b890f6cd793be7fafe41a4e552edbf641f1fed5ebbf45ed +size 159504 diff --git a/patchutils-0.4.2.tar.xz.sig b/patchutils-0.4.2.tar.xz.sig new file mode 100644 index 0000000..f548f0f --- /dev/null +++ b/patchutils-0.4.2.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEERimv6WDsIL7BLjEEt8INB5SR6mMFAl8Ra8cACgkQt8INB5SR +6mNU5gf9Ew9yo0w5MLyYefplX8xx9k2pVHTDtPo1Oh+n5ohJtnwlr2CkfNdprCT2 +I90kI+lG+EW2RJDZi1UxjGsZXf62j8bou5eSXu+5iIzxYCDK0Lq5//hXyd5ZMfUF +1dv0jHtpNDXRWQeTJ/L1bXXUz9K6VSQVJPtgVbpuRVFlBfk2/mmPjXscgPYZTsiP +JIAd9mtghHVFB0vSJQhxdQSFNIjBfDbUIby1w8zsnB7raV/s9VRcCWpRU2t6DsZL +xNGyC/IwQD2ke2oRxiOF4Fg3Zk4RgbZov1ssTVhFq/UqYgIWnhplUC2PP8n+Nhh8 +Yn46FTA/cJWpbwAgGtKPWt4DTZfunw== +=hA9R +-----END PGP SIGNATURE----- diff --git a/patchutils.changes b/patchutils.changes index f74cca5..06afb64 100644 --- a/patchutils.changes +++ b/patchutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Aug 16 00:36:26 UTC 2020 - Dirk Mueller + +- update to 0.4.2: + * Fixed a packaging issue + * New patchview mode with accompanying scripts. + * New grepdiff option --only-match. + * New filterdiff option --remove-timestamps. + * Assorted other fixes and improvements. +- remove patchutils-0.2.30-tailsyntax.diff: obsolete + ------------------------------------------------------------------- Mon Dec 16 14:08:27 UTC 2019 - Martin Pluskal diff --git a/patchutils.spec b/patchutils.spec index 8d99714..d59e116 100644 --- a/patchutils.spec +++ b/patchutils.spec @@ -1,7 +1,7 @@ # # spec file for package patchutils # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: patchutils -Version: 0.3.4 +Version: 0.4.2 Release: 0 Summary: A Collection of Tools for Manipulating Patch Files License: GPL-2.0-or-later @@ -25,7 +25,6 @@ Group: Productivity/File utilities URL: http://cyberelk.net/tim/software/patchutils/ Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz Source1: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz.sig -Patch0: %{name}-0.2.30-tailsyntax.diff Patch2: rediff-hunk-init-fix.diff BuildRequires: automake Requires: diffutils @@ -49,7 +48,7 @@ files in a patch. Rediff corrects hand-edited patches. %make_build %check -make --jobs=1 check +%make_build --jobs=1 check %install %make_install @@ -58,7 +57,7 @@ install -m 0644 -t %{buildroot}%{_mandir}/man1/ doc/*.1 %files %license COPYING -%doc AUTHORS BUGS ChangeLog NEWS README TODO +%doc BUGS README %{_bindir}/* %{_mandir}/man1/*.1%{?ext_man}