Re-add patchutils 0.4.3
D patchutils-0.4.2.tar.xz
D patchutils-0.4.2.tar.xz.sig
A patchutils-0.4.3.tar.xz
A patchutils-0.4.3.tar.xz.sig
M patchutils.changes
A patchutils.keyring
M patchutils.spec
Diff for working copy: .
Index: patchutils.changes
===================================================================
--- patchutils.changes (revision e9f43ca5b01cde0828fdd1c3c3de3b91)
+++ patchutils.changes (working copy)
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Sun Sep 21 16:01:15 UTC 2025 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 0.4.3:
+ * Add --in-place option to more tools for editing files in place
+ * Add --color option to interdiff with automatic terminal
+ detection
+ * Improve PCRE2 support
+ * Add support for CRLF line endings in patch files
+ * Fix interdiff to reverse line counts correctly when reversing
+ patches
+ * Add bash completions
+ * Various bug fixes and code correctness fixes
+ * Add new --as-numbered-lines options: original-before and
+ original-after
+ * Fix rediff to preserve diff command headers in multi-file
+ patches
+ * Fix recountdiff corruption of new file headers when git
+ signature lines are present
+- remove unnecessary build dependencies
+- build with xmlto to generate documentation
+- package bash completions, build with pcre2 support
+- add upstream signing key and validate source signature
+
-------------------------------------------------------------------
Mon Nov 27 10:54:35 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
Index: patchutils.spec
===================================================================
--- patchutils.spec (revision e9f43ca5b01cde0828fdd1c3c3de3b91)
+++ patchutils.spec (working copy)
@@ -2,6 +2,7 @@
# spec file for package patchutils
#
# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +18,21 @@
Name: patchutils
-Version: 0.4.2
+Version: 0.4.3
Release: 0
Summary: A Collection of Tools for Manipulating Patch Files
License: GPL-2.0-or-later
Group: Productivity/File utilities
-URL: http://cyberelk.net/tim/software/patchutils/
+URL: https://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
+# https://fedoraproject.org/wiki/User:Twaugh 0x4629AFE960EC20BEC12E3104B7C20D079491EA63
+Source2: %{name}.keyring
Patch2: rediff-hunk-init-fix.diff
-BuildRequires: automake
+BuildRequires: pkgconfig
BuildRequires: python-rpm-macros
+BuildRequires: xmlto
+BuildRequires: pkgconfig(libpcre2-8)
Requires: diffutils
Requires: patch
@@ -53,14 +58,11 @@
%install
%make_install
-install -m 0755 -d %{buildroot}%{_mandir}/man1/
-install -m 0644 -t %{buildroot}%{_mandir}/man1/ doc/*.1
-
-%python3_fix_shebang
+%{python3_fix_shebang}
%files
%license COPYING
-%doc BUGS README
+%doc AUTHORS BUGS NEWS TODO
%{_bindir}/combinediff
%{_bindir}/dehtmldiff
%{_bindir}/editdiff
@@ -81,5 +83,6 @@
%exclude %{_bindir}/svndiffview
%{_bindir}/unwrapdiff
%{_mandir}/man1/*.1%{?ext_man}
+%{_datadir}/bash-completion/completions/*
%changelog
Index: patchutils-0.4.3.tar.xz
===================================================================
Binary file 'patchutils-0.4.3.tar.xz' added.
Index: patchutils-0.4.3.tar.xz.sig
===================================================================
Binary file 'patchutils-0.4.3.tar.xz.sig' added.
Index: patchutils.keyring
===================================================================
--- patchutils.keyring (revision 0)
+++ patchutils.keyring (revision 0)
@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: 4629 AFE9 60EC 20BE C12E 3104 B7C2 0D07 9491 EA63
+Comment: Tim Waugh <tim@cyberelk.net>
+Comment: Tim Waugh <twaugh@redhat.com>
+
+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
++zbGSimCYaI=
+=hwRe
+-----END PGP PUBLIC KEY BLOCK-----
Index: patchutils-0.4.2.tar.xz
===================================================================
Binary file 'patchutils-0.4.2.tar.xz' deleted.
Index: patchutils-0.4.2.tar.xz.sig
===================================================================
--- patchutils-0.4.2.tar.xz.sig (revision e9f43ca5b01cde0828fdd1c3c3de3b91)
+++ patchutils-0.4.2.tar.xz.sig (working copy)
@@ -1,11 +0,0 @@
------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-----
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=29
2025-09-26 07:29:44 +00:00
|
|
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
|
|
|
|
Comment: 4629 AFE9 60EC 20BE C12E 3104 B7C2 0D07 9491 EA63
|
|
|
|
|
Comment: Tim Waugh <tim@cyberelk.net>
|
|
|
|
|
Comment: Tim Waugh <twaugh@redhat.com>
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
+zbGSimCYaI=
|
|
|
|
|
=hwRe
|
|
|
|
|
-----END PGP PUBLIC KEY BLOCK-----
|