diff --git a/patch-2.6.1.tar.bz2 b/patch-2.6.1.tar.bz2 new file mode 100644 index 0000000..228d13b --- /dev/null +++ b/patch-2.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d1441380c92ed8572049411406964a0a987aefd228be3abb8623eca1f3ced8a +size 253719 diff --git a/patch-2.6.tar.bz2 b/patch-2.6.tar.bz2 deleted file mode 100644 index 8036c14..0000000 --- a/patch-2.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f9080cc25b484ad8f668695de3675a3873e801d77c62bc8fd4164486312c0f4 -size 250220 diff --git a/patch.changes b/patch.changes index 1bea232..c3fd609 100644 --- a/patch.changes +++ b/patch.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Dec 30 17:14:24 CET 2009 - agruen@suse.de + +- Version 2.6.1: + + Support for diff3(1) style merges which show the old, original, + and new lines of a conflict has been added (--merge=diff3). + The default still is the merge(1) format (--merge or + --merge=merge). + + Bug and portability fixes. + +------------------------------------------------------------------- +Sun Dec 6 17:32:57 CET 2009 - jengelh + +- enable parallel building + ------------------------------------------------------------------- Fri Nov 13 15:45:06 CET 2009 - agruen@suse.de diff --git a/patch.spec b/patch.spec index 9d2cbba..e0c7dc8 100644 --- a/patch.spec +++ b/patch.spec @@ -1,7 +1,7 @@ # -# spec file for package patch (Version 2.6) +# spec file for package patch (Version 2.6.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Name: patch License: GPLv3+ Group: Productivity/Text/Utilities AutoReqProv: on -Version: 2.6 +Version: 2.6.1 Release: 1 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2