pool/patchutils
SHA256
17
0
Fork 2
Code Issues Pull Requests Activity
Files
factory
patchutils/patchutils.changes

247 lines
8.7 KiB
Plaintext
Raw Permalink Normal View History

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
-------------------------------------------------------------------
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
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
-------------------------------------------------------------------
Mon Nov 27 10:54:35 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
- Remove dependency on /usr/bin/python3, making scripts to depends on
the real python3 binary, not the link. bsc#1212476
-------------------------------------------------------------------
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
- skip svndiff tools as those conflict with subversion
-------------------------------------------------------------------
Mon Dec 16 14:08:27 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
- Drop xmlto dependency as it would introduce build cycle
-------------------------------------------------------------------
Thu Dec 12 09:33:35 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
- Modernise spec file
-------------------------------------------------------------------
Fri Jul 3 06:43:14 UTC 2015 - sleep_walker@opensuse.org
- 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
-------------------------------------------------------------------
Fri Aug 29 18:27:42 UTC 2014 - asterios.dramis@gmail.com
- Update to 0.3.3:
* Context output format for "no newline" lines has been fixed.
* The splitdiff utility now has an option to disable ".patch"
filename extensions.
* Some fixes for bugs spotted by Coverity.
* Interdiff can now use "-" (stdin) for one of the inputs.
- Run "make check" in %check section.
-------------------------------------------------------------------
Sat Mar 9 17:37:27 UTC 2013 - seife+obs@b1-systems.com
- fix build with autmake-1.13, convert changes to utf-8
-------------------------------------------------------------------
Fri Dec 2 16:30:33 UTC 2011 - coolo@suse.com
- add automake as buildrequire to avoid implicit dependency
-------------------------------------------------------------------
Mon Apr 4 14:50:41 UTC 2011 - sndirsch@novell.com
- added patch and diffutils to requires (bnc #662957)
-------------------------------------------------------------------
Thu Feb 10 23:36:05 UTC 2011 - pascal.bleser@opensuse.org
- update to 0.3.2:
* interdiff had previously been putting absolute filenames in the input to
the patch program; it now avoids doing this
* editdiff no longer runs rediff when no changes were made in the editor
* the correct exit status is now set when the decompress option fails
* a temporary file leak has been fixed
-------------------------------------------------------------------
Mon Apr 19 17:35:26 CEST 2010 - sndirsch@suse.de
- rediff-hunk-init-fix.diff (Takashi Iwai)
* hunk structure wasn't correctly initialized; fixes
tests/addhunk2 testcase, which broke the build
-------------------------------------------------------------------
Wed Jan 6 03:04:34 CET 2010 - jengelh@medozas.de
- enable parallel build
-------------------------------------------------------------------
Sat Jan 24 10:25:43 CET 2009 - sndirsch@suse.de
- patchutils 0.3.1
* new release
-------------------------------------------------------------------
Fri Jul 4 15:33:33 CEST 2008 - sndirsch@suse.de
- patchutils 0.3.0
* new release
-------------------------------------------------------------------
Fri Mar 16 18:05:26 CET 2007 - dmueller@suse.de
- fix rediff to actually work
-------------------------------------------------------------------
Wed Jan 25 21:39:17 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Wed Oct 5 11:11:21 CEST 2005 - mmj@suse.de
- Update to 0.2.31 which fixes severeal small bugs
-------------------------------------------------------------------
Wed Aug 11 15:11:16 CEST 2004 - mmj@suse.de
- Update to 0.2.30 where some minor parsing bugs were fixed,
the documentation was clarified, and a new option was added to
lsdiff/filterdiff for selecting patches based on the order in
which they appear.
-------------------------------------------------------------------
Tue Jul 6 17:18:42 CEST 2004 - mmj@suse.de
- Update to 0.2.29 including since 0.2.27:
o Some format conversion bugs were fixed.
o Fix no-newline handling
o Generate context format that GNU patch actually understands.
-------------------------------------------------------------------
Tue Mar 2 13:41:12 CET 2004 - mmj@suse.de
- Update to 0.2.27 including since 0.2.22:
o An option was added to lsdiff to treating empty files as
absent.
o The filterdiff and interdiff utilities now handle patches
containing embedded null characters.
o The dehtmldiff utility was improved slightly.
o A new filterdiff option for displaying patch filenames.
o A new splitdiff option to make it behave more like diffsplit.
o A new filterdiff option for removing timestamps.
o New grepdiff options -E and -f.
o Minor bugfixes
-------------------------------------------------------------------
Sat Jan 10 20:36:13 CET 2004 - adrian@suse.de
- add %defattr
-------------------------------------------------------------------
Tue Apr 8 01:43:10 CEST 2003 - ro@suse.de
- fix tail calling syntax in testsuite
-------------------------------------------------------------------
Wed Mar 26 14:29:29 CET 2003 - mmj@suse.de
- Update to 0.2.22:, including the following since 0.2.17:
· New splitdiff option to split out every file-level patch, and
a new option was added to grepdiff to display matching hunks
· A new tool was added for exchanging the order of two patches
· Support for ISO 8601 timezones
· Several bug fixes
· Our patches are in mainline
-------------------------------------------------------------------
Mon Mar 3 17:04:33 CET 2003 - pthomas@suse.de
- Use execvp in rediff, fixes #22428.
- Fix configure.in for automake 1.6.
-------------------------------------------------------------------
Tue Sep 17 13:57:26 CEST 2002 - uli@suse.de
- update -> 0.2.17 (support for conversion between unified and
context formats, new option (--annotate) added to filterdiff,
interdiff can now strip context lines from patches, recountdiff
and unwrapdiff tools added)
-------------------------------------------------------------------
Thu Jun 13 12:09:40 CEST 2002 - uli@suse.de
- update -> 0.2.14 (hunk-level filtering was added to filterdiff)
-------------------------------------------------------------------
Fri May 10 14:23:09 CEST 2002 - uli@suse.de
- update -> 0.2.13
-------------------------------------------------------------------
Fri Apr 19 16:07:00 CEST 2002 - uli@suse.de
- fixed the fix
-------------------------------------------------------------------
Fri Apr 19 15:41:55 CEST 2002 - uli@suse.de
- update -> 0.2.12pre1
- added support for different date formats
-------------------------------------------------------------------
Fri Feb 1 14:31:54 CET 2002 - uli@suse.de
- update -> 0.2.8 (adds grepdiff, bugfixes)
-------------------------------------------------------------------
Tue Dec 4 12:16:57 CET 2001 - uli@suse.de
- update -> 0.2.5 (bugs in lsdiff and combinediff fixed)
-------------------------------------------------------------------
Wed Nov 28 14:45:07 CET 2001 - uli@suse.de
- initial package
Reference in New Issue Copy Permalink