Accepting request 39270 from devel:tools

checked in (request 39270)

OBS-URL: https://build.opensuse.org/request/show/39270
OBS-URL: https://build.opensuse.org/package/show/devel:tools/patch?expand=0&rev=17

patch-2.6.1-9-gf376c5d.tar.bz2

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

patch-2.6.1.65-0c83.tar.bz2

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

patch.changes

@@ -1,36 +1,3 @@
--------------------------------------------------------------------
-Sun May  2 15:57:54 CEST 2010 - agruen@suse.de
-
-- Fix the linker library order.
-
--------------------------------------------------------------------
-Sun May  2 14:40:09 CEST 2010 - agruen@suse.de
-
-- Be more verbose when %verbose is defined.
-
--------------------------------------------------------------------
-Sun May  2 14:01:47 CEST 2010 - agruen@suse.de
-
-- Version 2.6.1.64:
-  + Support for most features of the "diff --git" format: renames
-    and copies, permission changes, symlink diffs.  (Binary diffs
-    are not supported yet; patch will complain and skip them.)
-  + Support for double-quoted filenames: when a filename in a
-    context diff starts with a double quote, it is interpreted as
-    a C string literal.  The escape sequences \\, \", \a, \b, \f, \n,
-    \r, \t, \v, and \ooo (a three-digit octal number between 0 and
-    255) are recognized.
-  + Refuse to patch read-only files by default, or at least warn
-    when patching such files with --force or --batch.
-  + Refuse to apply a normal patch to a symlink.  (Previous
-    versions of patch were wrongly replacing the symlink with a
-    regular file.)
-  + When a timestamp specifies a time zone, honor that instead of
-    assuming the local time zone (--set-date) or Universal
-    Coordinated Time (--set-utc).
-  + Support for nanosecond precision timestamps.
-  + Many portability and bug fixes.
-
 -------------------------------------------------------------------
 Sun Jan 31 16:22:05 CET 2010 - agruen@suse.de
 

patch.spec

@@ -18,13 +18,13 @@
 # norootforbuild
 
 Url:            ftp://alpha.gnu.org/gnu/diffutils/
-%define ver 2.6.1.65-0c83
+%define ver 2.6.1-9-gf376c5d
 
 Name:           patch
 License:        GPLv3+
 Group:          Productivity/Text/Utilities
 AutoReqProv:    on
-Version:        2.6.1.65
+Version:        2.6.1.9
 Release:        1
 Summary:        GNU patch
 Source:         ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2
@@ -49,13 +49,13 @@ Authors:
 %build
 CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \
 ./configure --prefix=%{_prefix}
-make %{?jobs:-j%jobs} %{verbose:V=1};
+make %{?jobs:-j%jobs};
 
 %check
-make check %{verbose:V=1}
+make check
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT %{verbose:V=1}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)

unified-reject-files-compat.diff

@@ -1,8 +1,8 @@
-Index: patch-2.6.1.64-4762/src/patch.c
+Index: patch-2.5.9-122-gba37782/src/patch.c
 ===================================================================
---- patch-2.6.1.64-4762.orig/src/patch.c
+--- patch-2.5.9-122-gba37782.orig/src/patch.c
-+++ patch-2.6.1.64-4762/src/patch.c
++++ patch-2.5.9-122-gba37782/src/patch.c
-@@ -622,6 +622,7 @@ static struct option const longopts[] =
+@@ -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},
@@ -10,7 +10,7 @@ Index: patch-2.6.1.64-4762/src/patch.c
    {NULL, no_argument, NULL, 0}
  };
  
-@@ -902,6 +903,11 @@ get_some_switches (void)
+@@ -841,6 +842,11 @@ get_some_switches (void)
  		else
  		  usage (stderr, 2);
  		break;