@@ -, +, @@ Updating 'patch' to 2.6.1 including ALTLinux patches. --- patch.spec.orig 2010-05-07 20:07:41 +0400 +++ patch.spec.orig 2010-05-11 20:44:23 +0400 @@ -1,6 +1,6 @@ Name: patch -Version: 2.5.9 -Release: alt3 +Version: 2.6.1 +Release: alt1 Summary: The GNU patch command, for modifying/upgrading files License: GPL @@ -8,14 +8,12 @@ Group: Text tools Url: http://www.gnu.org/software/patch/ Packager: Dmitry V. Levin -# ftp://alpha.gnu.org/gnu/diffutils/patch-%version.tar.gz -Source: patch-%version.tar +# Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz +Source: patch-%version.tar.gz -Patch0: patch-2.5.9-cvs-20030702-p_strip_trailing_cr.patch -Patch1: patch-2.5.9-suse-remember-backup-files.patch -Patch2: patch-2.5.9-rh-stderr.patch -Patch3: patch-2.5.9-mdk-sigsegv.patch -Patch4: patch-2.5.9-mdk-backup.patch +Patch0: patch-%version-rh-stderr.patch +Patch1: patch-%version-mdk-sigsegv.patch +Patch2: patch-%version-mdk-backup.patch %description The patch program applies diff files to originals. The diff command @@ -26,15 +24,12 @@ original file (patching the file). %prep %setup -q -%patch0 -p0 +%patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 bzip2 -9k ChangeLog %build -autoreconf -fisv %configure %make_build @@ -47,6 +42,10 @@ autoreconf -fisv %doc AUTHORS ChangeLog.bz2 NEWS README %changelog +* Fri May 7 2010 Vitaly Kuzmichev 2.6.1-alt1 +- Updated to 2.6.1 +- Updated some patches, retired others + * Sat Apr 14 2007 Dmitry V. Levin 2.5.9-alt3 - Uncompressed tarball. --- patch-2.5.9-rh-stderr.patch 2007-04-14 19:17:41 +0400 +++ patch-2.5.9-rh-stderr.patch 2010-05-07 21:10:28 +0400 @@ -1,7 +1,7 @@ --- patch-2.5.9-mdk-sigsegv.patch 2007-04-14 19:17:41 +0400 +++ patch-2.5.9-mdk-sigsegv.patch 2010-05-07 21:16:17 +0400 @@ -1,7 +1,7 @@ -diff -upk.orig patch-2.5.9.orig/inp.c patch-2.5.9/inp.c --- - patch-2.5.9.orig/inp.c 2003-05-20 13:58:02 +0000 +++ - patch-2.5.9.orig/inp.c 2010-05-07 21:12:11 +0400 @@ -16,19 +16,19 @@ diff -upk.orig patch-2.5.9.orig/inp.c pa /* Construct the line index, somehow or other. */ void -diff -upk.orig patch-2.5.9.orig/inp.h patch-2.5.9/inp.h --- patch-2.5.9-mdk-backup.patch 2007-04-14 19:17:41 +0400 +++ patch-2.5.9-mdk-backup.patch 2010-05-07 21:18:12 +0400 @@ -1,7 +1,7 @@ -diff -upk.orig patch-2.5.9.orig/patch.man patch-2.5.9/patch.man --- - patch-2.5.9.orig/patch.man 2002-05-25 10:36:44 +0000 +++ - patch-2.5.9.orig/patch.man 2010-05-07 21:17:06 +0400 @@ -10,15 +10,3 @@ diff -upk.orig patch-2.5.9.orig/patch.ma as a placeholder to represent the nonexistent file. See the .B \-V -diff -upk.orig patch-2.5.9.orig/util.c patch-2.5.9/util.c