Hello community,
here is the log from the commit of package patch for openSUSE:Factory
checked in at Mon Dec 21 14:32:30 CET 2009.
--------
--- patch/patch.changes 2009-09-07 13:44:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/patch/patch.changes 2009-12-21 14:24:22.734159000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 13 15:45:06 CET 2009 - agruen@suse.de
+
+- Version 2.6.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
patch-2.5.9-122-gba37782.tar.bz2
New:
----
patch-2.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ patch.spec ++++++
--- /var/tmp/diff_new_pack.9BA71k/_old 2009-12-21 14:31:43.000000000 +0100
+++ /var/tmp/diff_new_pack.9BA71k/_new 2009-12-21 14:31:43.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package patch (Version 2.5.9.122)
+# spec file for package patch (Version 2.6)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,13 +18,13 @@
# norootforbuild
Url: ftp://alpha.gnu.org/gnu/diffutils/
-%define ver 2.5.9-122-gba37782
+%define ver %version
Name: patch
-License: GPL v3 or later
+License: GPLv3+
Group: Productivity/Text/Utilities
AutoReqProv: on
-Version: 2.5.9.122
+Version: 2.6
Release: 1
Summary: GNU patch
Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2
@@ -49,7 +49,7 @@
%build
CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \
./configure --prefix=%{_prefix}
-make
+make %{?jobs:-j%jobs};
%check
make check
++++++ patch-2.5.9-122-gba37782.tar.bz2 -> patch-2.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patch-2.5.9-122-gba37782/ChangeLog new/patch-2.6/ChangeLog
--- old/patch-2.5.9-122-gba37782/ChangeLog 2009-09-04 13:56:00.000000000 +0200
+++ new/patch-2.6/ChangeLog 2009-11-12 17:25:08.000000000 +0100
@@ -1,3 +1,15 @@
+2009-11-12 Andreas Gruenbacher
+
+ * NEWS: Version 2.6 released.
+
+2009-10-27 Andreas Gruenbacher
+
+ * patch.man: Fix typo (reported by Vytautas Šaltenis).
+
+ * src/merge.c: Clarify the message when (part of) a hunk cannot be
+ merged.
+ * tests/merge: Adapt the test case.
+
2009-09-04 Andreas Gruenbacher
* Makefile.in (LIBSRCS, LIBHDRS, LIBM4FILES): Add the gnulib which
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patch-2.5.9-122-gba37782/NEWS new/patch-2.6/NEWS
--- old/patch-2.5.9-122-gba37782/NEWS 2009-07-19 17:49:31.000000000 +0200
+++ new/patch-2.6/NEWS 2009-11-12 17:24:40.000000000 +0100
@@ -1,3 +1,5 @@
+Changes in version 2.6:
+
* A regression test suite has been added ("make check").
* A --merge option has been added which will merge a patch file into
the original files similar to merge(1). See the patch(1) manual page for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patch-2.5.9-122-gba37782/README-alpha new/patch-2.6/README-alpha
--- old/patch-2.5.9-122-gba37782/README-alpha 2009-03-29 14:33:41.000000000 +0200
+++ new/patch-2.6/README-alpha 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-This is a test release of GNU patch.
-Please send comments and problem reports to .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patch-2.5.9-122-gba37782/VERSION new/patch-2.6/VERSION
--- old/patch-2.5.9-122-gba37782/VERSION 2009-09-04 13:56:44.000000000 +0200
+++ new/patch-2.6/VERSION 2009-11-12 17:25:54.000000000 +0100
@@ -1 +1 @@
-2.5.9-122-gba37782
+2.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patch-2.5.9-122-gba37782/aclocal.m4 new/patch-2.6/aclocal.m4
--- old/patch-2.5.9-122-gba37782/aclocal.m4 2009-07-19 16:27:42.000000000 +0200
+++ new/patch-2.6/aclocal.m4 2009-11-03 13:46:26.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patch-2.5.9-122-gba37782/configure new/patch-2.6/configure
--- old/patch-2.5.9-122-gba37782/configure 2009-09-04 13:56:46.000000000 +0200
+++ new/patch-2.6/configure 2009-11-12 17:25:57.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for patch 2.5.9-122-gba37782.
+# Generated by GNU Autoconf 2.63 for patch 2.6.
#
# Report bugs to .
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='patch'
PACKAGE_TARNAME='patch'
-PACKAGE_VERSION='2.5.9-122-gba37782'
-PACKAGE_STRING='patch 2.5.9-122-gba37782'
+PACKAGE_VERSION='2.6'
+PACKAGE_STRING='patch 2.6'
PACKAGE_BUGREPORT='bug-patch@gnu.org'
ac_unique_file="src/patch.c"
@@ -1275,7 +1275,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures patch 2.5.9-122-gba37782 to adapt to many kinds of systems.
+\`configure' configures patch 2.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1345,7 +1345,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of patch 2.5.9-122-gba37782:";;
+ short | recursive ) echo "Configuration of patch 2.6:";;
esac
cat <<\_ACEOF
@@ -1432,7 +1432,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-patch configure 2.5.9-122-gba37782
+patch configure 2.6
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1446,7 +1446,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by patch $as_me 2.5.9-122-gba37782, which was
+It was created by patch $as_me 2.6, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -10899,7 +10899,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by patch $as_me 2.5.9-122-gba37782, which was
+This file was extended by patch $as_me 2.6, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10958,7 +10958,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-patch config.status 2.5.9-122-gba37782
+patch config.status 2.6
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patch-2.5.9-122-gba37782/patch.man new/patch-2.6/patch.man
--- old/patch-2.5.9-122-gba37782/patch.man 2009-07-19 17:46:01.000000000 +0200
+++ new/patch-2.6/patch.man 2009-11-02 20:09:57.000000000 +0100
@@ -36,7 +36,7 @@
.B \*=backup
option.
The names of the files to be patched are usually taken from the patch file,
-but if there's just one file to be patched it can specified on the
+but if there's just one file to be patched it can be specified on the
command line as
.IR originalfile .
.PP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patch-2.5.9-122-gba37782/src/merge.c new/patch-2.6/src/merge.c
--- old/patch-2.5.9-122-gba37782/src/merge.c 2009-06-06 01:25:13.000000000 +0200
+++ new/patch-2.6/src/merge.c 2009-11-02 20:09:57.000000000 +0100
@@ -450,7 +450,7 @@
continue;
lines = 3 + (in - firstin) + (new - firstnew);
- merge_result (&first_result, hunk, "UNMERGED",
+ merge_result (&first_result, hunk, "NOT MERGED",
where, where + lines - 1);
out_offset += 3 + (new - firstnew);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patch-2.5.9-122-gba37782/tests/merge new/patch-2.6/tests/merge
--- old/patch-2.5.9-122-gba37782/tests/merge 2009-07-19 17:50:31.000000000 +0200
+++ new/patch-2.6/tests/merge 2009-11-02 20:09:57.000000000 +0100
@@ -79,7 +79,7 @@
# ==============================================================
check 'x 3 2c2b -- 2c2c' <