3
0
forked from pool/patchutils

- 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
This commit is contained in:
Dirk Mueller 2020-08-16 00:39:09 +00:00 committed by Git OBS Bridge
parent 3cd13b442a
commit a08c8d7b08
7 changed files with 29 additions and 19 deletions

View File

@ -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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cf55d4db83ead41188f5b6be16f60f6b76a87d5db1c42f5459d596e81dabe876
size 166400

Binary file not shown.

BIN
patchutils-0.4.2.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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-----

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Aug 16 00:36:26 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- 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 <mpluskal@suse.com> Mon Dec 16 14:08:27 UTC 2019 - Martin Pluskal <mpluskal@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package patchutils # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: patchutils Name: patchutils
Version: 0.3.4 Version: 0.4.2
Release: 0 Release: 0
Summary: A Collection of Tools for Manipulating Patch Files Summary: A Collection of Tools for Manipulating Patch Files
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -25,7 +25,6 @@ Group: Productivity/File utilities
URL: http://cyberelk.net/tim/software/patchutils/ URL: http://cyberelk.net/tim/software/patchutils/
Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz 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 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 Patch2: rediff-hunk-init-fix.diff
BuildRequires: automake BuildRequires: automake
Requires: diffutils Requires: diffutils
@ -49,7 +48,7 @@ files in a patch. Rediff corrects hand-edited patches.
%make_build %make_build
%check %check
make --jobs=1 check %make_build --jobs=1 check
%install %install
%make_install %make_install
@ -58,7 +57,7 @@ install -m 0644 -t %{buildroot}%{_mandir}/man1/ doc/*.1
%files %files
%license COPYING %license COPYING
%doc AUTHORS BUGS ChangeLog NEWS README TODO %doc BUGS README
%{_bindir}/* %{_bindir}/*
%{_mandir}/man1/*.1%{?ext_man} %{_mandir}/man1/*.1%{?ext_man}