Name: patchutils Version: 0.2.31 Release: alt3 Summary: Patchutils is a small collection of programs that operate on patch files License: GPL Group: Text tools Url: http://cyberelk.net/tim/patchutils/ Packager: Dmitry V. Levin <ldv@altlinux.org> # http://cyberelk.net/tim/data/patchutils/stable/patchutils-%version.tar.bz2 Source: patchutils-%version.tar Patch1: patchutils-0.2.30-owl-tmp.patch Patch2: patchutils-0.2.31-up-author.patch Requires: patch, diffutils, mktemp >= 1:1.3.1 Provides: interdiff Obsoletes: interdiff BuildPreReq: xmlto Summary(ru_RU.KOI8-R): îÁÂÏÒ ÐÒÏÇÒÁÍÍ ÄÌÑ ÏÂÒÁÂÏÔËÉ ÐÁÔÞÅÊ %description Patchutils is a small collection of programs that operate on patch files. This version contains: + combinediff: creates a cumulative patch from two incremental patches; + dehtmldiff: gets usable diff from an HTML page; + filterdiff: extracts or excludes diffs from a diff file; + fixcvsdiff: fixes problematic cvs diff files; + flipdiff: exchanges the order of two incremental patches; + grepdiff: shows files modified by a diff containing a regex; + espdiff: applies the appropriate transformation to a set of patches; + interdiff: shows differences between two unified diff files; + lsdiff: shows which files are modified by a patch; + recountdiff: recomputes patch counts and offsets; + rediff: fixes offsets and counts of a hand-edited diff; + splitdiff: separates out incremental patches; + unwrapdiff: demangles word-wrapped patches. %description -l ru_RU.KOI8-R ôÅÒÍÉÎÏÍ "ÐÁÔÞ" ("patch", "ÚÁÐÌÁÔËÁ") ÏÂÏÚÎÁÞÁÀÔ ÓÐÉÓÏË ÏÔÌÉÞÉÊ ÍÅÖÄÕ Ä×ÕÍÑ ×ÅÒÓÉÑÍÉ ÉÌÉ ×ÁÒÉÁÎÔÁÍÉ ÉÓÈÏÄÎÏÇÏ ÔÅËÓÔÁ, ÐÒÏÇÒÁÍÍÎÏÇÏ ËÏÄÁ ÉÌÉ ÄÁÎÎÙÈ. ðÁÔÞ ÍÏÖÅÔ ÉÍÅÔØ ËÁË ÔÅËÓÔÏ×ÕÀ, ÔÁË É Ä×ÏÉÞÎÕÀ ÆÏÒÍÕ. ðÏÐÕÌÑÒÎÙÅ ÂÁÚÏ×ÙÅ ÕÔÉÌÉÔÙ diff É patch ÐÒÅÄÎÁÚÎÁÞÅÎÙ ÄÌÑ ÓÏÚÄÁÎÉÑ É ÐÒÉÍÅÎÅÎÉÑ ÐÁÔÞÅÊ ÔÅËÓÔÏ×ÏÇÏ ÆÏÒÍÁÔÁ ÄÌÑ ÔÅËÓÔÏ×ÙÈ ÄÁÎÎÙÈ, × ÐÅÒ×ÕÀ ÏÞÅÒÅÄØ - ÄÌÑ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ× É ËÏÎÆÉÇÕÒÁÃÉÏÎÎÙÈ ÆÁÊÌÏ×, ÉÓÐÏÌØÚÕÅÍÙÈ ÐÒÏÇÒÁÍÍÉÓÔÁÍÉ É ÓÉÓÔÅÍÎÙÍÉ ÁÄÍÉÎÉÓÔÒÁÔÏÒÁÍÉ. äÁÎÎÙÊ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÒÑÄ ÐÏÌÅÚÎÙÈ ×ÓÐÏÍÏÇÁÔÅÌØÎÙÈ ÕÔÉÌÉÔ ÄÌÑ ÒÁÂÏÔÙ Ó ÐÁÔÞÁÍÉ: + combinediff: ÓÏÚÄÁ£Ô ÏÂßÅÄÉΣÎÎÙÊ ËÕÍÕÌÑÔÉ×ÎÙÊ ÐÁÔÞ ÉÚ Ä×ÕÈ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÙÈ; + dehtmldiff: ÉÚ×ÌÅËÁÅÔ ÔÅËÓÔ ÐÁÔÞÁ ÉÚ HTML-ÓÔÒÁÎÉÃÙ; + filterdiff: ÉÚ×ÌÅËÁÅÔ ÉÌÉ ÉÓËÌÀÞÁÅÔ diff-ÏÔÞ£ÔÙ ÉÚ diff-ÆÁÊÌÁ; + fixcvsdiff: ÉÓÐÒÁ×ÌÑÅÔ ×ÏÚÍÏÖÎÙÅ ÏÛÉÂËÉ × diff-ÆÁÊÌÁÈ CVS; + flipdiff: ÍÅÎÑÅÔ ÐÏÒÑÄÏË ÎÁÌÏÖÅÎÉÑ Ä×ÕÈ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÙÈ ÐÁÔÞÅÊ; + grepdiff: ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÆÁÊÌÏ×, ÉÚÍÅÎÑÅÍÙÈ ÐÁÔÞÅÍ, ÓÏÄÅÒÖÁÝÉÍ ÕËÁÚÁÎÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ; + interdiff: ÐÏËÁÚÙ×ÁÅÔ ÓÐÉÓÏË ÏÔÌÉÞÉÊ ÍÅÖÄÕ Ä×ÕÍÑ ÐÁÔÞÁÍÉ; + lsdiff: ×Ù×ÏÄÉÔ ÓÐÉÓÏË ÆÁÊÌÏ×, ÉÚÍÅÎÑÅÍÙÈ ÐÁÔÞÅÍ; + recountdiff: ÚÁÎÏ×Ï ÒÁÓÞÉÔÙ×ÁÅÔ ËÏÏÒÄÉÎÁÔÙ ÆÒÁÇÍÅÎÔÏ× ÐÁÔÞÁ × ÉÓÈÏÄÎÉËÁÈ; + rediff: ÉÓÐÒÁ×ÌÑÅÔ ËÏÏÒÄÉÎÁÔÙ ÆÒÁÇÍÅÎÔÏ× ×Ï ×ÒÕÞÎÕÀ ÉÓÐÒÁ×ÌÑ×ÛÅÍÓÑ ÐÁÔÞÅ; + splitdiff: ÒÁÚÄÅÌÑÅÔ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÙÅ ÉÎËÒÅÍÅÎÔÁÌØÎÙÅ ÐÁÔÞÉ; + unwrapdiff: ÕÄÁÌÑÅÔ ÌÉÛÎÉÅ ÐÅÒÅÎÏÓÙ ÓÔÒÏË ÉÚ ÐÁÔÞÅÊ, ×ÙÒÁ×ÎÅÎÎÙÈ × ÔÅËÔÏ×ÏÍ ÒÅÄÁËÔÏÒÅ ÐÏ ÐÒÁ×ÙÍ ÇÒÁÎÉÃÁÍ ÓÌÏ×. %prep %setup -q %patch1 -p1 %patch2 -p1 bzip2 -9k ChangeLog %build %configure %make_build %install %makeinstall %files %_bindir/* %_mandir/man?/* %doc AUTHORS BUGS ChangeLog.bz2 NEWS TODO %changelog * Fri Apr 13 2007 Dmitry V. Levin <ldv@altlinux.org> 0.2.31-alt3 - Rebuilt. * Tue Jun 06 2006 Dmitry V. Levin <ldv@altlinux.org> 0.2.31-alt2 - Imported temporary file handling fix from Owl. * Wed Jan 4 2006 Ilya Evseev <evseev@altlinux.ru> 0.2.31-alt1 - Updated to 0.2.31 - Specfile: added russian summary/description * Fri Nov 26 2004 Dmitry V. Levin <ldv@altlinux.org> 0.2.30-alt1 - Updated to 0.2.30: + some minor parsing bugs were fixed; + the documentation was clarified; + a new option was added to lsdiff/filterdiff for selecting patches based on the order in which they appear. * Wed Apr 07 2004 Dmitry V. Levin <ldv@altlinux.org> 0.2.29-alt1 - Updated to 0.2.29 (bugfix release). * Thu Mar 18 2004 Dmitry V. Levin <ldv@altlinux.org> 0.2.28-alt1 - Updated to 0.2.28 (bugfix release). * Sun Feb 29 2004 Dmitry V. Levin <ldv@altlinux.org> 0.2.27-alt1 - Updated to 0.2.27: + An option was added to lsdiff to treating empty files as absent. + The filterdiff and interdiff utilities now handle patches containing embedded null characters. + The dehtmldiff utility was improved slightly. * Sat Jan 17 2004 Dmitry V. Levin <ldv@altlinux.org> 0.2.26-alt1 - Updated to 0.2.26: + Some build fixes were made. * Tue Dec 16 2003 Dmitry V. Levin <ldv@altlinux.org> 0.2.25-alt1 - Updated to 0.2.25: + New filterdiff option for displaying patch filenames. + New splitdiff option to make it behave more like diffsplit. + Other minor bugfixes. * Fri Sep 12 2003 Dmitry V. Levin <ldv@altlinux.org> 0.2.24-alt1 - Updated to 0.2.24: + New filterdiff option for removing timestamps. + New grepdiff options: -E and -f. = Minor bugfixes. - Added support for -H in lsdiff/grepdiff (from CVS). - Fixed syntax error in dehtmldiff(1). * Tue Mar 11 2003 Dmitry V. Levin <ldv@altlinux.org> 0.2.22-alt1 - Updated to 0.2.22: Several small bugs were fixed. A new option was added to splitdiff to split out every file-level patch, and a new option was added to grepdiff to display matching hunks. A new tools was added for applying the appropriate transformation to a set of patches. * Sun Feb 23 2003 Dmitry V. Levin <ldv@altlinux.org> 0.2.21-alt1 - Updated to 0.2.21: Several bugs were fixed in flipdiff and dehtmldiff. * Thu Feb 06 2003 Dmitry V. Levin <ldv@altlinux.org> 0.2.20-alt1 - Updated to 0.2.20: A new tool was added for exchanging the order of two patches. * Fri Jan 24 2003 Dmitry V. Levin <ldv@altlinux.org> 0.2.19-alt1 - Updated to 0.2.19: Several bug fixes were made, and a new program was added for extracting a diff from an HTML page. * Tue Dec 17 2002 Dmitry V. Levin <ldv@altlinux.org> 0.2.18-alt1 - Updated to 0.2.18 * Thu Sep 12 2002 Dmitry V. Levin <ldv@altlinux.org> 0.2.17-alt1 - 0.2.17 * Fri Sep 06 2002 Dmitry V. Levin <ldv@altlinux.org> 0.2.17-alt0.1pre4 - 0.2.17pre4 - Corrected description. * Mon Aug 19 2002 Dmitry V. Levin <ldv@altlinux.org> 0.2.16-alt1 - 0.2.16 * Wed Jun 05 2002 Dmitry V. Levin <ldv@altlinux.org> 0.2.14-alt1 - 0.2.14 * Wed May 15 2002 Dmitry V. Levin <ldv@altlinux.org> 0.2.13-alt1 - 0.2.13 * Sat Apr 27 2002 Dmitry V. Levin <ldv@alt-linux.org> 0.2.12-alt1 - 0.2.12 * Fri Mar 15 2002 Dmitry V. Levin <ldv@alt-linux.org> 0.2.11-alt1 - 0.2.11 * Wed Mar 06 2002 Dmitry V. Levin <ldv@alt-linux.org> 0.2.10-alt1 - 0.2.10 * Tue Feb 26 2002 Dmitry V. Levin <ldv@alt-linux.org> 0.2.9-alt1 - 0.2.9 * Mon Feb 04 2002 Dmitry V. Levin <ldv@alt-linux.org> 0.2.8-alt1 - 0.2.8 * Mon Jan 21 2002 Dmitry V. Levin <ldv@alt-linux.org> 0.2.7-alt1 - 0.2.7 * Mon Dec 03 2001 Dmitry V. Levin <ldv@alt-linux.org> 0.2.5-alt1 - 0.2.5 * Thu Nov 29 2001 Dmitry V. Levin <ldv@alt-linux.org> 0.2.4-alt1 - 0.2.4, updated description. * Wed Nov 21 2001 Dmitry V. Levin <ldv@alt-linux.org> 0.2.2-alt1 - 0.2.2 * Sun Nov 18 2001 Dmitry V. Levin <ldv@alt-linux.org> 0.2.1-alt1 - 0.2.1 * Tue Nov 13 2001 Dmitry V. Levin <ldv@alt-linux.org> 0.2.0-alt1 - 0.2.0 * Wed Oct 24 2001 Dmitry V. Levin <ldv@alt-linux.org> 0.1.5-alt1 - 0.1.5 - Updated descriptions. * Thu Oct 18 2001 Stanislav Ievlev <inger@altlinux.ru> 0.1.4-alt0.1 - 0.1.4 pre. * Wed Oct 17 2001 Stanislav Ievlev <inger@altlinux.ru> 0.1.3-alt1 - Adopted for ALT. - Ported cleanup patches from interdiff * Tue Oct 16 2001 Thierry Vignaud <tvignaud@mandrakesoft.com> 0.1.3-1mdk - initial release - obsoletes interdiff - macroize - more docs