rpms/patch
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't document unsupported -m option; document -x option (bug #948972).

Browse Source
This commit is contained in:
Tim Waugh 2013-04-11 11:28:09 +01:00
parent 3df4ea100c
commit cfe682fbc8
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
patch-args.patch Normal file
View File

@ -0,0 +1,20 @@
diff -up patch-2.7.1/src/patch.c.args patch-2.7.1/src/patch.c
--- patch-2.7.1/src/patch.c.args 2013-04-11 11:30:52.644026499 +0100
+++ patch-2.7.1/src/patch.c 2013-04-11 11:31:54.990246532 +0100
@@ -762,7 +762,7 @@ static char const *const option_help[] =
"",
" -D NAME --ifdef=NAME Make merged if-then-else output using NAME.",
#ifdef ENABLE_MERGE
-" -m --merge Merge using conflict markers instead of creating reject files.",
+" --merge Merge using conflict markers instead of creating reject files.",
#endif
" -E --remove-empty-files Remove output files that are empty after patching.",
"",
@@ -801,6 +801,7 @@ static char const *const option_help[] =
" --binary Read and write data in binary mode.",
" --read-only=BEHAVIOR How to handle read-only input files: 'ignore' that they",
" are read-only, 'warn' (default), or 'fail'.",
+" -x NUM --debug=NUM Set internal debugging flags.",
"",
" -v --version Output version info.",
" --help Output this help.",

9
patch.spec
View File

@ -1,12 +1,13 @@
Summary: Utility for modifying/upgrading files
Name: patch
Version: 2.7.1
Release: 4%{?dist}
Release: 5%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/patch/patch.html
Group: Development/Tools
Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
Patch1: patch-remove-empty-dir.patch
Patch2: patch-args.patch
Patch100: patch-selinux.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -30,6 +31,9 @@ applications.
# Upstream patch to fix removal of empty directories (bug #919489).
%patch1 -p1 -b .remove-empty-dir
# Don't document unsupported -m option; document -x option (bug #948972).
%patch2 -p1 -b .args
# SELinux support.
%patch100 -p1 -b .selinux
@ -58,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/*
%changelog
* Thu Apr 11 2013 Tim Waugh <twaugh@redhat.com> 2.7.1-5
- Don't document unsupported -m option; document -x option (bug #948972).
* Mon Mar 25 2013 Ville Skyttä <ville.skytta@iki.fi> - 2.7.1-4
- Build with xattr support.
- Make build output more verbose.