pool/patch
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 21490 from devel:tools

Browse Source 
Copy from devel:tools/patch based on submit request 21490 from user agruen

OBS-URL: https://build.opensuse.org/request/show/21490
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patch?expand=0&rev=13
This commit is contained in:
OBS User autobuild 2009-10-03 01:35:36 +00:00 committed by Git OBS Bridge
parent 4900247a4d
commit e15ff121e8
5 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
patch-2.5.9-120-g62d03ac.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3a10f89a436792a5b043413c58b16fb249f3eb94574c1b2f9a2ba642a861c9a
size 247271

3
patch-2.5.9-122-gba37782.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4973d0bbfc0132e9ba7fc559586432f8d3d09a5c389ef421c7dc3c7a79fb7e32
size 250490

8
patch.changes
View File

@ -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 Mon Jul 20 10:12:48 CEST 2009 - agruen@suse.de

8
patch.spec
View File

@ -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. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,16 +18,17 @@
# norootforbuild # norootforbuild
Url: ftp://alpha.gnu.org/gnu/diffutils/ Url: ftp://alpha.gnu.org/gnu/diffutils/
%define ver 2.5.9-120-g62d03ac %define ver 2.5.9-122-gba37782
Name: patch Name: patch
License: GPL v3 or later License: GPL v3 or later
Group: Productivity/Text/Utilities Group: Productivity/Text/Utilities
AutoReqProv: on AutoReqProv: on
Version: 2.5.9.120 Version: 2.5.9.122
Release: 1 Release: 1
Summary: GNU patch Summary: GNU patch
Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2 Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2
Patch: unified-reject-files-compat.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -43,6 +44,7 @@ Authors:
%prep %prep
%setup -n patch-%ver %setup -n patch-%ver
%patch -p1
%build %build
CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \ CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \

24
unified-reject-files-compat.diff Normal file
View File

@ -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);
}