diff --git a/.patchutils.metadata b/.patchutils.metadata new file mode 100644 index 0000000..af22456 --- /dev/null +++ b/.patchutils.metadata @@ -0,0 +1 @@ +89d3f8a454bacede1b9a112b3a13701ed876fcc1 SOURCES/patchutils-0.3.3.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/patchutils-args.patch b/SOURCES/patchutils-args.patch new file mode 100644 index 0000000..76e7f1f --- /dev/null +++ b/SOURCES/patchutils-args.patch @@ -0,0 +1,49 @@ +diff -U0 patchutils-0.3.3/ChangeLog.args patchutils-0.3.3/ChangeLog +--- patchutils-0.3.3/ChangeLog.args 2013-04-02 11:42:17.000000000 +0100 ++++ patchutils-0.3.3/ChangeLog 2013-04-11 12:46:59.396964337 +0100 +@@ -0,0 +1,5 @@ ++2013-04-11 Tim Waugh ++ ++ * src/filterdiff.c: Don't show grepdiff-specific options in ++ help output for filterdiff/lsdiff (bug #948973). ++ +diff -up patchutils-0.3.3/src/filterdiff.c.args patchutils-0.3.3/src/filterdiff.c +--- patchutils-0.3.3/src/filterdiff.c.args 2011-05-26 14:47:46.000000000 +0100 ++++ patchutils-0.3.3/src/filterdiff.c 2013-04-11 12:46:59.397964342 +0100 +@@ -2,7 +2,7 @@ + * filterdiff - extract (or exclude) a diff from a diff file + * lsdiff - show which files are modified by a patch + * grepdiff - show files modified by a patch containing a regexp +- * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011 Tim Waugh ++ * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011, 2013 Tim Waugh + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -1068,7 +1068,7 @@ const char * syntax_str = + " remove all comments (non-diff lines) from output (filterdiff)\n" + " -z, --decompress\n" + " decompress .gz and .bz2 files\n" +-" -n, --line-number\n" ++" -n, --line-number (lsdiff, grepdiff)\n" + " show line numbers (lsdiff, grepdiff)\n" + " --number-files (lsdiff, grepdiff)\n" + " show file numbers, for use with filterdiff's --files option (lsdiff, grepdiff)\n" +@@ -1085,15 +1085,15 @@ const char * syntax_str = + " prefix pathnames in old files with PREFIX\n" + " --addnewprefix=PREFIX\n" + " prefix pathnames in new files with PREFIX\n" +-" -s, --status\n" ++" -s, --status (lsdiff)\n" + " show file additions and removals (lsdiff)\n" + " -v, --verbose\n" + " verbose output -- use more than once for extra verbosity\n" +-" -E, --extended-regexp\n" ++" -E, --extended-regexp (grepdiff)\n" + " use extended regexps, like egrep (grepdiff)\n" + " -E, --empty-files-as-absent (lsdiff)\n" + " treat empty files as absent (lsdiff)\n" +-" -f FILE, --file=FILE\n" ++" -f FILE, --file=FILE (grepdiff)\n" + " read regular expressions from FILE (grepdiff)\n" + " --filter run as 'filterdiff' (grepdiff, lsdiff)\n" + " --list run as 'lsdiff' (filterdiff, grepdiff)\n" diff --git a/SPECS/patchutils.spec b/SPECS/patchutils.spec new file mode 100644 index 0000000..49aa259 --- /dev/null +++ b/SPECS/patchutils.spec @@ -0,0 +1,233 @@ +Summary: A collection of programs for manipulating patch files +Name: patchutils +Version: 0.3.3 +Release: 2%{?dist} +License: GPLv2+ +Group: Applications/System +URL: http://cyberelk.net/tim/patchutils/ +Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz +Patch1: patchutils-args.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: interdiff <= 0.0.10 +Provides: interdiff = 0.0.10 +BuildRequires: xmlto + +# We only need xmlto if we are patching the documentation. +# BuildRequires: xmlto + +%description +This is a collection of programs that can manipulate patch files in +a variety of ways, such as interpolating between two pre-patches, +combining two incremental patches, fixing line numbers in hand-edited +patches, and simply listing the files modified by a patch. + +%prep +%setup -q + +# Fixed help output (bug #948973). +%patch1 -p1 -b .args + +%build +touch doc/patchutils.xml +%configure +make %{?smp_mflags} + +%check +make check + +%install +rm -rf %{buildroot} +make DESTDIR=%{buildroot} install + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog README COPYING BUGS NEWS +%{_bindir}/* +%{_mandir}/*/* + +%changelog +* Thu Apr 11 2013 Tim Waugh 0.3.3-2 +- Fixed help output (bug #948973). +- Fixed changelog dates. + +* Tue Apr 2 2013 Tim Waugh 0.3.3-1 +- 0.3.3. + +* Thu Feb 14 2013 Fedora Release Engineering - 0.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jul 20 2012 Fedora Release Engineering - 0.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Feb 10 2011 Tim Waugh 0.3.2-1 +- 0.3.2. + +* Tue Feb 08 2011 Fedora Release Engineering - 0.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jul 25 2009 Fedora Release Engineering - 0.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 23 2009 Tim Waugh 0.3.1-1 +- 0.3.1. + +* Wed Jul 2 2008 Tim Waugh 0.3.0-1 +- 0.3.0. + +* Wed Feb 13 2008 Tim Waugh 0.2.31-5 +- Rebuild for GCC 4.3. + +* Mon Dec 3 2007 Tim Waugh 0.2.31-4 +- Versioned obsoletes/provides (bug #226234). +- Created %%check section (bug #226234). +- Avoid %%makeinstall (bug #226234). +- Fixed defattr declaration (bug #226234). + +* Wed Aug 29 2007 Tim Waugh 0.2.31-3 +- Added dist tag. +- Better buildroot tag. +- More specific license tag. + +* Wed Jul 12 2006 Jesse Keating - 0.2.31-2.2.2 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 0.2.31-2.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 0.2.31-2.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Jul 22 2005 Tim Waugh +- Better structure in XML documentation. + +* Tue Jul 19 2005 Tim Waugh 0.2.31-2 +- Rebuilt to pick up new man-pages stylesheet. + +* Mon Jun 13 2005 Tim Waugh 0.2.31-1 +- 0.2.31. + +* Wed Mar 2 2005 Tim Waugh 0.2.30-4 +- Rebuild for new GCC. + +* Mon Nov 22 2004 Tim Waugh 0.2.30-3 +- Moved last fix into docbook-style-xsl. + +* Mon Nov 22 2004 Jindrich Novy 0.2.30-2 +- fix flipdiff.1 man page (#139341) + +* Thu Jul 22 2004 Tim Waugh 0.2.30-1 +- 0.2.30. + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Apr 16 2004 Tim Waugh 0.2.29-2 +- Fix no-newline handling in filterdiff. + +* Mon Apr 5 2004 Tim Waugh 0.2.29-1 +- 0.2.29. + +* Wed Mar 10 2004 Tim Waugh 0.2.28-1 +- 0.2.28. + +* Thu Feb 26 2004 Tim Waugh 0.2.27-1 +- 0.2.27. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jan 12 2004 Tim Waugh 0.2.26-1 +- 0.2.26. + +* Tue Jan 6 2004 Tim Waugh +- Ship AUTHORS and ChangeLog as well (bug #112936). + +* Mon Dec 15 2003 Tim Waugh 0.2.25-1 +- 0.2.25. + +* Wed Sep 3 2003 Tim Waugh +- Remove buildroot before installing. + +* Thu Jul 31 2003 Tim Waugh 0.2.24-2 +- Add support for -H in lsdiff/grepdiff (from CVS). + +* Fri Jul 25 2003 Tim Waugh 0.2.24-1 +- 0.2.24 (fixes bug #100795). + +* Thu Jun 5 2003 Elliot Lee +- rebuilt + +* Thu Jun 5 2003 Tim Waugh 0.2.23-2 +- Added patch from CVS which adds timestamp removal to filterdiff. + +* Thu Jun 5 2003 Tim Waugh 0.2.23-1.1 +- Rebuilt. + +* Thu Jun 5 2003 Tim Waugh 0.2.23-1 +- 0.2.23. Fixes bug #92320. + +* Sat Mar 8 2003 Tim Waugh 0.2.22-1 +- 0.2.22. + +* Thu Jan 23 2003 Tim Waugh 0.2.19-1 +- 0.2.19, incorporating all patches. + +* Wed Jan 22 2003 Tim Powers 0.2.18-3 +- rebuilt + +* Wed Jan 22 2003 Tim Waugh +- Apply editdiff patch from 0.2.19pre2. + +* Wed Jan 22 2003 Tim Waugh 0.2.18-2 +- Bug-fix for rediff. + +* Mon Dec 16 2002 Tim Waugh 0.2.18-1 +- Fix file_exists(). +- 0.2.18. + +* Wed Oct 16 2002 Tim Waugh 0.2.17-1 +- 0.2.17. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Sat May 18 2002 Tim Waugh 0.2.14-1 +- 0.2.14. + +* Thu May 9 2002 Tim Waugh 0.2.13-1 +- 0.2.13. + +* Tue Apr 23 2002 Tim Waugh 0.2.13-0.pre1.1 +- 0.2.13pre1 (now handles diffutils 2.8.1 output). +- Run tests after build step. + +* Fri Apr 19 2002 Tim Waugh 0.2.12-1 +- 0.2.12. + +* Wed Mar 20 2002 Tim Waugh 0.2.11-2 +- Fix handling of context diffs so that it handles GNU diff's output + style. + +* Thu Mar 14 2002 Tim Waugh 0.2.11-1 +- 0.2.11. + +* Mon Mar 04 2002 Florian La Roche +- I need this. :-) + +* Tue Nov 27 2001 Tim Waugh +- Initial spec file.