|
|
83836c |
Summary: A collection of programs for manipulating patch files
|
|
|
83836c |
Name: patchutils
|
|
|
83836c |
Version: 0.3.4
|
|
|
83836c |
Release: 10%{?dist}
|
|
|
83836c |
License: GPLv2+
|
|
|
83836c |
Group: Applications/System
|
|
|
83836c |
URL: http://cyberelk.net/tim/patchutils/
|
|
|
83836c |
Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz
|
|
|
83836c |
Patch1: patchutils-bz1226985.patch
|
|
|
83836c |
Patch2: patchutils-format-str.patch
|
|
|
83836c |
Obsoletes: interdiff <= 0.0.10
|
|
|
83836c |
Provides: interdiff = 0.0.11
|
|
|
83836c |
BuildRequires: perl-generators
|
|
|
83836c |
BuildRequires: xmlto
|
|
|
83836c |
BuildRequires: automake, autoconf
|
|
|
83836c |
|
|
|
83836c |
%description
|
|
|
83836c |
This is a collection of programs that can manipulate patch files in
|
|
|
83836c |
a variety of ways, such as interpolating between two pre-patches,
|
|
|
83836c |
combining two incremental patches, fixing line numbers in hand-edited
|
|
|
83836c |
patches, and simply listing the files modified by a patch.
|
|
|
83836c |
|
|
|
83836c |
%prep
|
|
|
83836c |
%setup -q
|
|
|
83836c |
|
|
|
83836c |
# Fixed handling of delete-file diffs from git (bug #1226985).
|
|
|
83836c |
%patch1 -p1 -b .bz1226985
|
|
|
83836c |
|
|
|
83836c |
# Don't use regerror() result as format string.
|
|
|
83836c |
%patch2 -p1 -b .format-str
|
|
|
83836c |
|
|
|
83836c |
autoreconf
|
|
|
83836c |
|
|
|
83836c |
%build
|
|
|
83836c |
touch doc/patchutils.xml
|
|
|
83836c |
%configure
|
|
|
83836c |
make %{?_smp_mflags}
|
|
|
83836c |
|
|
|
83836c |
%check
|
|
|
83836c |
make check
|
|
|
83836c |
|
|
|
83836c |
%install
|
|
|
83836c |
make DESTDIR=%{buildroot} install
|
|
|
83836c |
|
|
|
83836c |
%clean
|
|
|
83836c |
rm -rf %{buildroot}
|
|
|
83836c |
|
|
|
83836c |
%files
|
|
|
83836c |
%{!?_licensedir:%global license %doc}
|
|
|
83836c |
%doc AUTHORS ChangeLog README BUGS NEWS
|
|
|
83836c |
%license COPYING
|
|
|
83836c |
%{_bindir}/*
|
|
|
83836c |
%{_mandir}/*/*
|
|
|
83836c |
|
|
|
83836c |
%changelog
|
|
|
83836c |
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-10
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-9
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-8
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Mon May 15 2017 Tim Waugh <twaugh@redhat.com> - 0.3.4-7
|
|
|
83836c |
- Don't use regerror() result as format string.
|
|
|
83836c |
|
|
|
83836c |
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-6
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-5
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Fri Aug 21 2015 Tim Waugh <twaugh@redhat.com> - 0.3.4-4
|
|
|
83836c |
- Spec file cleanups (bug #1251587).
|
|
|
83836c |
|
|
|
83836c |
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.4-3
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Tue Jun 9 2015 Tim Waugh <twaugh@redhat.com> - 0.3.4-2
|
|
|
83836c |
- Fixed handling of delete-file diffs from git (bug #1226985).
|
|
|
83836c |
|
|
|
83836c |
* Mon Apr 20 2015 Tim Waugh <twaugh@redhat.com> - 0.3.4-1
|
|
|
83836c |
- 0.3.4.
|
|
|
83836c |
|
|
|
83836c |
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.3-6
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.3-5
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.3-4
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 0.3.3-3
|
|
|
83836c |
- Perl 5.18 rebuild
|
|
|
83836c |
|
|
|
83836c |
* Thu Apr 11 2013 Tim Waugh <twaugh@redhat.com> 0.3.3-2
|
|
|
83836c |
- Fixed help output (bug #948973).
|
|
|
83836c |
- Fixed changelog dates.
|
|
|
83836c |
|
|
|
83836c |
* Tue Apr 2 2013 Tim Waugh <twaugh@redhat.com> 0.3.3-1
|
|
|
83836c |
- 0.3.3.
|
|
|
83836c |
|
|
|
83836c |
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.2-4
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.2-3
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.2-2
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Thu Feb 10 2011 Tim Waugh <twaugh@redhat.com> 0.3.2-1
|
|
|
83836c |
- 0.3.2.
|
|
|
83836c |
|
|
|
83836c |
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-4
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-3
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-2
|
|
|
83836c |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
|
83836c |
|
|
|
83836c |
* Fri Jan 23 2009 Tim Waugh <twaugh@redhat.com> 0.3.1-1
|
|
|
83836c |
- 0.3.1.
|
|
|
83836c |
|
|
|
83836c |
* Wed Jul 2 2008 Tim Waugh <twaugh@redhat.com> 0.3.0-1
|
|
|
83836c |
- 0.3.0.
|
|
|
83836c |
|
|
|
83836c |
* Wed Feb 13 2008 Tim Waugh <twaugh@redhat.com> 0.2.31-5
|
|
|
83836c |
- Rebuild for GCC 4.3.
|
|
|
83836c |
|
|
|
83836c |
* Mon Dec 3 2007 Tim Waugh <twaugh@redhat.com> 0.2.31-4
|
|
|
83836c |
- Versioned obsoletes/provides (bug #226234).
|
|
|
83836c |
- Created %%check section (bug #226234).
|
|
|
83836c |
- Avoid %%makeinstall (bug #226234).
|
|
|
83836c |
- Fixed defattr declaration (bug #226234).
|
|
|
83836c |
|
|
|
83836c |
* Wed Aug 29 2007 Tim Waugh <twaugh@redhat.com> 0.2.31-3
|
|
|
83836c |
- Added dist tag.
|
|
|
83836c |
- Better buildroot tag.
|
|
|
83836c |
- More specific license tag.
|
|
|
83836c |
|
|
|
83836c |
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.2.31-2.2.2
|
|
|
83836c |
- rebuild
|
|
|
83836c |
|
|
|
83836c |
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.2.31-2.2.1
|
|
|
83836c |
- bump again for double-long bug on ppc(64)
|
|
|
83836c |
|
|
|
83836c |
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 0.2.31-2.2
|
|
|
83836c |
- rebuilt for new gcc4.1 snapshot and glibc changes
|
|
|
83836c |
|
|
|
83836c |
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
|
|
83836c |
- rebuilt
|
|
|
83836c |
|
|
|
83836c |
* Fri Jul 22 2005 Tim Waugh <twaugh@redhat.com>
|
|
|
83836c |
- Better structure in XML documentation.
|
|
|
83836c |
|
|
|
83836c |
* Tue Jul 19 2005 Tim Waugh <twaugh@redhat.com> 0.2.31-2
|
|
|
83836c |
- Rebuilt to pick up new man-pages stylesheet.
|
|
|
83836c |
|
|
|
83836c |
* Mon Jun 13 2005 Tim Waugh <twaugh@redhat.com> 0.2.31-1
|
|
|
83836c |
- 0.2.31.
|
|
|
83836c |
|
|
|
83836c |
* Wed Mar 2 2005 Tim Waugh <twaugh@redhat.com> 0.2.30-4
|
|
|
83836c |
- Rebuild for new GCC.
|
|
|
83836c |
|
|
|
83836c |
* Mon Nov 22 2004 Tim Waugh <twaugh@redhat.com> 0.2.30-3
|
|
|
83836c |
- Moved last fix into docbook-style-xsl.
|
|
|
83836c |
|
|
|
83836c |
* Mon Nov 22 2004 Jindrich Novy <jnovy@redhat.com> 0.2.30-2
|
|
|
83836c |
- fix flipdiff.1 man page (#139341)
|
|
|
83836c |
|
|
|
83836c |
* Thu Jul 22 2004 Tim Waugh <twaugh@redhat.com> 0.2.30-1
|
|
|
83836c |
- 0.2.30.
|
|
|
83836c |
|
|
|
83836c |
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
|
|
|
83836c |
- rebuilt
|
|
|
83836c |
|
|
|
83836c |
* Fri Apr 16 2004 Tim Waugh <twaugh@redhat.com> 0.2.29-2
|
|
|
83836c |
- Fix no-newline handling in filterdiff.
|
|
|
83836c |
|
|
|
83836c |
* Mon Apr 5 2004 Tim Waugh <twaugh@redhat.com> 0.2.29-1
|
|
|
83836c |
- 0.2.29.
|
|
|
83836c |
|
|
|
83836c |
* Wed Mar 10 2004 Tim Waugh <twaugh@redhat.com> 0.2.28-1
|
|
|
83836c |
- 0.2.28.
|
|
|
83836c |
|
|
|
83836c |
* Thu Feb 26 2004 Tim Waugh <twaugh@redhat.com> 0.2.27-1
|
|
|
83836c |
- 0.2.27.
|
|
|
83836c |
|
|
|
83836c |
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
|
|
83836c |
- rebuilt
|
|
|
83836c |
|
|
|
83836c |
* Mon Jan 12 2004 Tim Waugh <twaugh@redhat.com> 0.2.26-1
|
|
|
83836c |
- 0.2.26.
|
|
|
83836c |
|
|
|
83836c |
* Tue Jan 6 2004 Tim Waugh <twaugh@redhat.com>
|
|
|
83836c |
- Ship AUTHORS and ChangeLog as well (bug #112936).
|
|
|
83836c |
|
|
|
83836c |
* Mon Dec 15 2003 Tim Waugh <twaugh@redhat.com> 0.2.25-1
|
|
|
83836c |
- 0.2.25.
|
|
|
83836c |
|
|
|
83836c |
* Wed Sep 3 2003 Tim Waugh <twaugh@redhat.com>
|
|
|
83836c |
- Remove buildroot before installing.
|
|
|
83836c |
|
|
|
83836c |
* Thu Jul 31 2003 Tim Waugh <twaugh@redhat.com> 0.2.24-2
|
|
|
83836c |
- Add support for -H in lsdiff/grepdiff (from CVS).
|
|
|
83836c |
|
|
|
83836c |
* Fri Jul 25 2003 Tim Waugh <twaugh@redhat.com> 0.2.24-1
|
|
|
83836c |
- 0.2.24 (fixes bug #100795).
|
|
|
83836c |
|
|
|
83836c |
* Thu Jun 5 2003 Elliot Lee <sopwith@redhat.com>
|
|
|
83836c |
- rebuilt
|
|
|
83836c |
|
|
|
83836c |
* Thu Jun 5 2003 Tim Waugh <twaugh@redhat.com> 0.2.23-2
|
|
|
83836c |
- Added patch from CVS which adds timestamp removal to filterdiff.
|
|
|
83836c |
|
|
|
83836c |
* Thu Jun 5 2003 Tim Waugh <twaugh@redhat.com> 0.2.23-1.1
|
|
|
83836c |
- Rebuilt.
|
|
|
83836c |
|
|
|
83836c |
* Thu Jun 5 2003 Tim Waugh <twaugh@redhat.com> 0.2.23-1
|
|
|
83836c |
- 0.2.23. Fixes bug #92320.
|
|
|
83836c |
|
|
|
83836c |
* Sat Mar 8 2003 Tim Waugh <twaugh@redhat.com> 0.2.22-1
|
|
|
83836c |
- 0.2.22.
|
|
|
83836c |
|
|
|
83836c |
* Thu Jan 23 2003 Tim Waugh <twaugh@redhat.com> 0.2.19-1
|
|
|
83836c |
- 0.2.19, incorporating all patches.
|
|
|
83836c |
|
|
|
83836c |
* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 0.2.18-3
|
|
|
83836c |
- rebuilt
|
|
|
83836c |
|
|
|
83836c |
* Wed Jan 22 2003 Tim Waugh <twaugh@redhat.com>
|
|
|
83836c |
- Apply editdiff patch from 0.2.19pre2.
|
|
|
83836c |
|
|
|
83836c |
* Wed Jan 22 2003 Tim Waugh <twaugh@redhat.com> 0.2.18-2
|
|
|
83836c |
- Bug-fix for rediff.
|
|
|
83836c |
|
|
|
83836c |
* Mon Dec 16 2002 Tim Waugh <twaugh@redhat.com> 0.2.18-1
|
|
|
83836c |
- Fix file_exists().
|
|
|
83836c |
- 0.2.18.
|
|
|
83836c |
|
|
|
83836c |
* Wed Oct 16 2002 Tim Waugh <twaugh@redhat.com> 0.2.17-1
|
|
|
83836c |
- 0.2.17.
|
|
|
83836c |
|
|
|
83836c |
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
|
|
|
83836c |
- automated rebuild
|
|
|
83836c |
|
|
|
83836c |
* Thu May 23 2002 Tim Powers <timp@redhat.com>
|
|
|
83836c |
- automated rebuild
|
|
|
83836c |
|
|
|
83836c |
* Sat May 18 2002 Tim Waugh <twaugh@redhat.com> 0.2.14-1
|
|
|
83836c |
- 0.2.14.
|
|
|
83836c |
|
|
|
83836c |
* Thu May 9 2002 Tim Waugh <twaugh@redhat.com> 0.2.13-1
|
|
|
83836c |
- 0.2.13.
|
|
|
83836c |
|
|
|
83836c |
* Tue Apr 23 2002 Tim Waugh <twaugh@redhat.com> 0.2.13-0.pre1.1
|
|
|
83836c |
- 0.2.13pre1 (now handles diffutils 2.8.1 output).
|
|
|
83836c |
- Run tests after build step.
|
|
|
83836c |
|
|
|
83836c |
* Fri Apr 19 2002 Tim Waugh <twaugh@redhat.com> 0.2.12-1
|
|
|
83836c |
- 0.2.12.
|
|
|
83836c |
|
|
|
83836c |
* Wed Mar 20 2002 Tim Waugh <twaugh@redhat.com> 0.2.11-2
|
|
|
83836c |
- Fix handling of context diffs so that it handles GNU diff's output
|
|
|
83836c |
style.
|
|
|
83836c |
|
|
|
83836c |
* Thu Mar 14 2002 Tim Waugh <twaugh@redhat.com> 0.2.11-1
|
|
|
83836c |
- 0.2.11.
|
|
|
83836c |
|
|
|
83836c |
* Mon Mar 04 2002 Florian La Roche <Florian.LaRoche@redhat.de>
|
|
|
83836c |
- I need this. :-)
|
|
|
83836c |
|
|
|
83836c |
* Tue Nov 27 2001 Tim Waugh <twaugh@redhat.com>
|
|
|
83836c |
- Initial spec file.
|