diff --git a/patch-2.5.9-120-g62d03ac.tar.bz2 b/patch-2.5.9-120-g62d03ac.tar.bz2 deleted file mode 100644 index 410813d..0000000 --- a/patch-2.5.9-120-g62d03ac.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3a10f89a436792a5b043413c58b16fb249f3eb94574c1b2f9a2ba642a861c9a -size 247271 diff --git a/patch-2.5.9-122-gba37782.tar.bz2 b/patch-2.5.9-122-gba37782.tar.bz2 new file mode 100644 index 0000000..149a98f --- /dev/null +++ b/patch-2.5.9-122-gba37782.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4973d0bbfc0132e9ba7fc559586432f8d3d09a5c389ef421c7dc3c7a79fb7e32 +size 250490 diff --git a/patch.changes b/patch.changes index 3ee154a..7ab5c95 100644 --- a/patch.changes +++ b/patch.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 7 13:30:46 CEST 2009 - agruen@suse.de + +- Version 2.5.9.122: + + Try to preserve the owning group of patched files. +- Add --unified-reject-files backwards-compatibility patch to + older SUSE versions of patch. + ------------------------------------------------------------------- Mon Jul 20 10:12:48 CEST 2009 - agruen@suse.de diff --git a/patch.spec b/patch.spec index d0b1c7d..2304701 100644 --- a/patch.spec +++ b/patch.spec @@ -1,5 +1,5 @@ # -# spec file for package patch (Version 2.5.9.120) +# spec file for package patch (Version 2.5.9.122) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,16 +18,17 @@ # norootforbuild Url: ftp://alpha.gnu.org/gnu/diffutils/ -%define ver 2.5.9-120-g62d03ac +%define ver 2.5.9-122-gba37782 Name: patch License: GPL v3 or later Group: Productivity/Text/Utilities AutoReqProv: on -Version: 2.5.9.120 +Version: 2.5.9.122 Release: 1 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2 +Patch: unified-reject-files-compat.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,6 +44,7 @@ Authors: %prep %setup -n patch-%ver +%patch -p1 %build CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \ diff --git a/unified-reject-files-compat.diff b/unified-reject-files-compat.diff new file mode 100644 index 0000000..9633c0c --- /dev/null +++ b/unified-reject-files-compat.diff @@ -0,0 +1,24 @@ +Index: patch-2.5.9-122-gba37782/src/patch.c +=================================================================== +--- patch-2.5.9-122-gba37782.orig/src/patch.c ++++ patch-2.5.9-122-gba37782/src/patch.c +@@ -572,6 +572,7 @@ static struct option const longopts[] = + {"posix", no_argument, NULL, CHAR_MAX + 7}, + {"quoting-style", required_argument, NULL, CHAR_MAX + 8}, + {"reject-format", required_argument, NULL, CHAR_MAX + 9}, ++ {"unified-reject-files", no_argument, NULL, CHAR_MAX + 1001}, + {NULL, no_argument, NULL, 0} + }; + +@@ -841,6 +842,11 @@ get_some_switches (void) + else + usage (stderr, 2); + break; ++ case CHAR_MAX + 1001: ++ say ("warning: the `--unified-reject-files' option is obsolete; use " ++ "`--reject-format=unified' instead\n"); ++ reject_format = UNI_DIFF; ++ break; + default: + usage (stderr, 2); + }