From ef64327fd507c76bd739f7a21430ede42678687e Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Sat, 6 Jan 2024 08:26:21 +0100 Subject: [PATCH] update to 0.3.3 [release 0.3.3-1mamba;Sat Apr 13 2013] --- README.md | 12 ++++++ patchutils-0.2.31-docbook.patch | 31 +++++++++++++++ patchutils.spec | 68 +++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 patchutils-0.2.31-docbook.patch create mode 100644 patchutils.spec diff --git a/README.md b/README.md index 60a51b4..d0e98a4 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,14 @@ # patchutils +Patchutils is a small collection of programs that operate on patch files: +* interdiff generates an incremental patch from two patches against a common source +* combinediff generates a single patch from two incremental patches, allowing you to merge patches together +* filterdiff will select the portions of a patch file that apply to files matching (or, alternatively, not matching) a shell wildcard +* fixcvsdiff corrects the output of ‘cvs diff’ +* rediff corrects hand-edited patches, by comparing the original patch with the modified one and adjusting the offsets and counts +* lsdiff displays a short listing of affected files in a patch file, along with (optionally) the line numbers of the start of each patch +* splitdiff separates out patches from a patch file so that each new patch file only alters any given file once +* grepdiff displays a list of the files modified by a patch where the patch contains a given regular expression +* recountdiff fixes up counts and offsets in a unified diff +* unwrapdiff fixes word-wrapped unified diffs. + diff --git a/patchutils-0.2.31-docbook.patch b/patchutils-0.2.31-docbook.patch new file mode 100644 index 0000000..f7337b4 --- /dev/null +++ b/patchutils-0.2.31-docbook.patch @@ -0,0 +1,31 @@ +--- patchutils-0.2.31/doc/patchutils.xml.author 2005-03-22 13:18:36.000000000 +0000 ++++ patchutils-0.2.31/doc/patchutils.xml 2005-07-22 15:08:10.000000000 +0100 +@@ -4,18 +4,20 @@ + + + Patchutils +- +- Tim +- Waugh +- +-
twaugh@redhat.com
+- +- + + + +- Man pages ++ ++ ++ Tim ++ Waugh ++ ++
twaugh@redhat.com
++ ++ ++ + ++ Man pages + + + patchutils diff --git a/patchutils.spec b/patchutils.spec new file mode 100644 index 0000000..240d58a --- /dev/null +++ b/patchutils.spec @@ -0,0 +1,68 @@ +Name: patchutils +Version: 0.3.3 +Release: 1mamba +Summary: A small collection of programs that operate on patch files +Group: Applications/Development +Vendor: openmamba +Distribution: openmamba +Packager: Stefano Cotta Ramusino +URL: http://cyberelk.net/tim/software/patchutils +Source: http://cyberelk.net/tim/data/patchutils/stable/patchutils-%{version}.tar.xz +Patch: %{name}-0.2.31-docbook.patch +License: GPL +Requires: diffutils +Requires: patch +BuildRequires: xmlto +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +Patchutils is a small collection of programs that operate on patch files: +* interdiff generates an incremental patch from two patches against a common source +* combinediff generates a single patch from two incremental patches, allowing you to merge patches together +* filterdiff will select the portions of a patch file that apply to files matching (or, alternatively, not matching) a shell wildcard +* fixcvsdiff corrects the output of ‘cvs diff’ +* rediff corrects hand-edited patches, by comparing the original patch with the modified one and adjusting the offsets and counts +* lsdiff displays a short listing of affected files in a patch file, along with (optionally) the line numbers of the start of each patch +* splitdiff separates out patches from a patch file so that each new patch file only alters any given file once +* grepdiff displays a list of the files modified by a patch where the patch contains a given regular expression +* recountdiff fixes up counts and offsets in a unified diff +* unwrapdiff fixes word-wrapped unified diffs. + +%prep +%setup -q +#%patch0 -p1 + +%build +touch doc/patchutils.xml +%configure +%make check + +%install +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +%makeinstall + +%clean +[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" + +%files +%defattr(-,root,root) +%{_bindir}/*diff +%{_mandir}/man1/* +%doc AUTHORS COPYING +#BUGS ChangeLog NEWS README TODO + +%changelog +* Sat Apr 13 2013 Automatic Build System 0.3.3-1mamba +- update to 0.3.3 + +* Sat Feb 12 2011 Automatic Build System 0.3.2-1mamba +- automatic update by autodist + +* Fri Jan 30 2009 Silvan Calarco 0.3.1-1mamba +- automatic update by autodist + +* Thu Oct 02 2008 Silvan Calarco 0.3.0-1mamba +- automatic update by autodist + +* Fri Jun 08 2007 Stefano Cotta Ramusino 0.2.31-1mamba +- package created by autospec