pool/patchutils
SHA256
17
0
Fork 2
Code Issues Pull Requests Activity
35 Commits 3 Branches 0 Tags
factory
Commit Graph

35 Commits

This Branch
This Branch
All Branches
Author SHA256 Message Date
Ana Guerrero
2fca499618 Accepting request 1307295 from devel:tools 
- 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

OBS-URL: https://build.opensuse.org/request/show/1307295
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=30
 2025-10-02 17:21:20 +00:00
Ana Guerrero
a0c308cbb9 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
Ana Guerrero
2bdbfbf31d Revert. It introduces xmlto and somehow this wasn't detected when building in Staging 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=29
 2025-09-26 07:26:08 +00:00
OBS User buildservice-autocommit
2d01364a38 Updating link to change in openSUSE:Factory/patchutils revision 29 
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=e9f43ca5b01cde0828fdd1c3c3de3b91
 2025-09-26 07:26:08 +00:00
Ana Guerrero
2bb97df04f Accepting request 1306327 from devel:tools 
OBS-URL: https://build.opensuse.org/request/show/1306327
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=28
 2025-09-25 16:44:51 +00:00
Stefan Dirsch
507173920e Accepting request 1306314 from home:AndreasStieger:branches:devel:tools 
patchutils 0.4.3

OBS-URL: https://build.opensuse.org/request/show/1306314
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=27
 2025-09-21 18:32:57 +00:00
Ana Guerrero
da8d45a0cf Accepting request 1129148 from devel:tools 
OBS-URL: https://build.opensuse.org/request/show/1129148
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=27
 2023-11-28 21:17:29 +00:00
Stefan Dirsch
b314c1a33b Accepting request 1129106 from home:dgarcia:branches:devel:tools 
- Remove dependency on /usr/bin/python3, making scripts to depends on
  the real python3 binary, not the link. bsc#1212476

OBS-URL: https://build.opensuse.org/request/show/1129106
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=25
 2023-11-27 14:19:54 +00:00
Dominique Leuenberger
25e9797d7d Accepting request 829595 from devel:tools 
- 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
- skip svndiff tools as those conflict with subversion

OBS-URL: https://build.opensuse.org/request/show/829595
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=26
 2020-08-31 14:47:10 +00:00
Dirk Mueller
2c15a59db3 - skip svndiff tools as those conflict with subversion 
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=23
 2020-08-25 16:43:12 +00:00
Dirk Mueller
a08c8d7b08 - 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
 2020-08-16 00:39:09 +00:00
Dominique Leuenberger
ccf09470ac Accepting request 757360 from devel:tools 
- Drop xmlto dependency as it would introduce build cycle

- Modernise spec file

OBS-URL: https://build.opensuse.org/request/show/757360
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=25
 2019-12-21 11:40:29 +00:00
Martin Pluskal
3cd13b442a - Drop xmlto dependency as it would introduce build cycle 
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=20
 2019-12-16 14:08:56 +00:00
Martin Pluskal
f0e69e744a - Modernise spec file 
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=19
 2019-12-12 09:34:01 +00:00
Stephan Kulow
1c991c8611 Accepting request 314948 from devel:tools 
1

OBS-URL: https://build.opensuse.org/request/show/314948
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=24
 2015-07-21 11:23:47 +00:00
Stefan Dirsch
0398df4cc5 Accepting request 314938 from home:sleep_walker:branches:devel:tools 
- Update to 0.3.4
  * Some fixes for filterdiff and rediff.
  * The splitdiff utility now has an option to write output to a
    subdirectory.
  * Ranges can now be prefixed by a modifier ('x') to exclude spans
    instead of include them.
  * Extended headers produced by git are now handled by filterdiff
    and interdiff.
- remove overrun.diff (upstream has the fix already)
- remove autoconf part from spec file as tarball is generated with
  new enough versions
- install man pages manually
- add signature file

OBS-URL: https://build.opensuse.org/request/show/314938
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=17
 2015-07-03 08:06:01 +00:00
Stephan Kulow
c8c917ae38 Accepting request 247117 from devel:tools 
1

OBS-URL: https://build.opensuse.org/request/show/247117
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=23
 2014-09-03 16:20:29 +00:00
Marcus Meissner
5433e5d049 Accepting request 246964 from home:adra:branches:devel:tools 
Update to 0.3.3

OBS-URL: https://build.opensuse.org/request/show/246964
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=15
 2014-09-01 15:39:48 +00:00
Stephan Kulow
adf11a573f Accepting request 158128 from devel:tools 
fix build with autmake-1.13, convert changes to utf-8 (forwarded request 158126 from seife)

OBS-URL: https://build.opensuse.org/request/show/158128
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=20
 2013-03-10 07:36:20 +00:00
Stefan Dirsch
f9342e7d42 Accepting request 158126 from home:seife:branches:devel:tools 
fix build with autmake-1.13, convert changes to utf-8

OBS-URL: https://build.opensuse.org/request/show/158126
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=13
 2013-03-09 19:33:17 +00:00
Stephan Kulow
c141c029dc Accepting request 101302 from devel:tools 
buildreq automake

OBS-URL: https://build.opensuse.org/request/show/101302
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=17
 2012-01-25 10:08:32 +00:00
Greg Kroah-Hartman
7fff9d1782 Accepting request 95129 from home:coolo:removeautomake 
add automake to buildrequires

OBS-URL: https://build.opensuse.org/request/show/95129
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=11
 2011-12-02 19:02:46 +00:00
Berthold Gunreben
8041947b52 Autobuild autoformatter for 65947 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=15
 2011-04-05 06:35:50 +00:00
Berthold Gunreben
d9e47901db Accepting request 65947 from devel:tools 
Accepted submit request 65947 from user coolo

OBS-URL: https://build.opensuse.org/request/show/65947
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=14
 2011-04-05 06:35:41 +00:00
Stefan Dirsch
25d71123c8 Accepting request 65943 from home:sndirsch:branches:devel:tools 
reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/65943
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=9
 2011-04-04 15:12:33 +00:00
Sascha Peilicke
4e5bb69cb2 Autobuild autoformatter for 65918 
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=13
 2011-04-04 14:37:30 +00:00
OBS User buildservice-autocommit
c64ed4c08f Updating link to change in openSUSE:Factory/patchutils revision 13.0 
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patchutils?expand=0&rev=7b59e2512f5eadb11de5a71b45fab99e
 2011-04-04 14:37:30 +00:00
Sascha Peilicke
a062eedbd1 Accepting request 65918 from devel:tools 
Accepted submit request 65918 from user licensedigger

OBS-URL: https://build.opensuse.org/request/show/65918
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=12
 2011-04-04 14:37:21 +00:00
OBS User autobuild
9fc9001b1b Accepting request 38245 from home:sndirsch:branches:openSUSE:Factory 
Copy from home:sndirsch:branches:openSUSE:Factory/patchutils based on submit request 38245 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/38245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=8
 2010-04-20 00:26:55 +00:00
OBS User autobuild
87fb4377f8 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=7 2010-03-18 15:15:12 +00:00
OBS User autobuild
63e644dd98 Accepting request 29050 from devel:tools 
Copy from devel:tools/patchutils based on submit request 29050 from user coolo

OBS-URL: https://build.opensuse.org/request/show/29050
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=6
 2010-01-12 13:48:26 +00:00
OBS User unknown
544c7834fb OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=4 2009-01-25 00:21:10 +00:00
OBS User unknown
b9932a2e08 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=3 2008-07-08 21:26:19 +00:00
OBS User unknown
a5fbf2be72 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=2 2007-03-18 05:52:38 +00:00
OBS User unknown
1a094d551a OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patchutils?expand=0&rev=1 2007-01-15 23:29:12 +00:00