forked from pool/patchutils
This commit is contained in:
commit
1a094d551a
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
11
patchutils-0.2.30-tailsyntax.diff
Normal file
11
patchutils-0.2.30-tailsyntax.diff
Normal file
@ -0,0 +1,11 @@
|
||||
--- 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
|
3
patchutils-0.2.31.tar.bz2
Normal file
3
patchutils-0.2.31.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3d087c88f6e2cc8fde8d2ab12ff2f85ca3ecb2c67754d0483d158f2e5802b015
|
||||
size 146392
|
112
patchutils.changes
Normal file
112
patchutils.changes
Normal file
@ -0,0 +1,112 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
124
patchutils.spec
Normal file
124
patchutils.spec
Normal file
@ -0,0 +1,124 @@
|
||||
#
|
||||
# spec file for package patchutils (Version 0.2.31)
|
||||
#
|
||||
# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
# Please submit bugfixes or comments via http://www.suse.de/feedback/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
Name: patchutils
|
||||
URL: http://cyberelk.net/tim/patchutils/
|
||||
License: GPL
|
||||
Group: Productivity/File utilities
|
||||
Autoreqprov: on
|
||||
Version: 0.2.31
|
||||
Release: 1
|
||||
Summary: A Collection of Tools for Manipulating Patch Files
|
||||
Source: %name-%version.tar.bz2
|
||||
Patch: %name-0.2.30-tailsyntax.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
Patchutils contains a collection of tools for manipulating patch files:
|
||||
interdiff, combinediff, filterdiff, fixcvsdiff, rediff, lsdiff, and
|
||||
splitdiff. You can use interdiff to create an incremental patch between
|
||||
two patches that are against a common source tree. Combinediff can be
|
||||
used for creating a cumulative diff from two incremental patches.
|
||||
Filterdiff is for extracting or excluding patches from a patch set
|
||||
based on modified files matching shell wildcards. Lsdiff lists modified
|
||||
files in a patch. Rediff corrects hand-edited patches.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Tim Waugh <twaugh@redhat.com>
|
||||
Marko Kreen <marko@l-t.ee>
|
||||
Matthias Hanisch <matze@camline.com>
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -p1
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
./configure --prefix=/usr --mandir=%_mandir
|
||||
make
|
||||
make check
|
||||
|
||||
%install
|
||||
make DESTDIR=%buildroot install
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
|
||||
/usr/bin/*
|
||||
%_mandir/man1/*.1.gz
|
||||
|
||||
%changelog -n patchutils
|
||||
* Wed Jan 25 2006 - mls@suse.de
|
||||
- converted neededforbuild to BuildRequires
|
||||
* Wed Oct 05 2005 - mmj@suse.de
|
||||
- Update to 0.2.31 which fixes severeal small bugs
|
||||
* Wed Aug 11 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 06 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 02 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 2004 - adrian@suse.de
|
||||
- add %%defattr
|
||||
* Tue Apr 08 2003 - ro@suse.de
|
||||
- fix tail calling syntax in testsuite
|
||||
* Wed Mar 26 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 03 2003 - pthomas@suse.de
|
||||
- Use execvp in rediff, fixes #22428.
|
||||
- Fix configure.in for automake 1.6.
|
||||
* Tue Sep 17 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 2002 - uli@suse.de
|
||||
- update -> 0.2.14 (hunk-level filtering was added to filterdiff)
|
||||
* Fri May 10 2002 - uli@suse.de
|
||||
- update -> 0.2.13
|
||||
* Fri Apr 19 2002 - uli@suse.de
|
||||
- fixed the fix
|
||||
* Fri Apr 19 2002 - uli@suse.de
|
||||
- update -> 0.2.12pre1
|
||||
- added support for different date formats
|
||||
* Fri Feb 01 2002 - uli@suse.de
|
||||
- update -> 0.2.8 (adds grepdiff, bugfixes)
|
||||
* Tue Dec 04 2001 - uli@suse.de
|
||||
- update -> 0.2.5 (bugs in lsdiff and combinediff fixed)
|
||||
* Wed Nov 28 2001 - uli@suse.de
|
||||
- initial package
|
Loading…
Reference in New Issue
Block a user