OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patch?expand=0&rev=12

patch-2.5.9-118-g4e89466.tar.bz2

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

patch-2.5.9-120-g62d03ac.tar.bz2

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

patch.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jul 20 10:12:48 CEST 2009 - agruen@suse.de
+
+- Version 2.5.9.120:
+  + When copying files, use full_write() from gnulib instead of
+    write().
+  + The -m option hasn't been officially allocated yet.  Use only
+    the long form for now (--merge).
+
 -------------------------------------------------------------------
 Fri Jun 19 08:33:32 CEST 2009 - agruen@suse.de
 

patch.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package patch (Version 2.5.9.118)
+# spec file for package patch (Version 2.5.9.120)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,13 +18,13 @@
 # norootforbuild
 
 Url:            ftp://alpha.gnu.org/gnu/diffutils/
-%define ver 2.5.9-118-g4e89466
+%define ver 2.5.9-120-g62d03ac
 
 Name:           patch
 License:        GPL v3 or later
 Group:          Productivity/Text/Utilities
 AutoReqProv:    on
-Version:        2.5.9.118
+Version:        2.5.9.120
 Release:        1
 Summary:        GNU patch
 Source:         ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.bz2
@@ -62,162 +62,3 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %doc %{_mandir}/man1/patch.1.gz
 
 %changelog
-* Fri Jun 19 2009 agruen@suse.de
-- Version 2.5.9.118:
-  + Change the default value of PATCH_GET to 0.
-  + When merging, make sure that hunks will not end up "out of order"
-  + When the file to patch is specified on the command line,
-  apply all patches to that file
-  + Some portability fixes/improvements
-  + Don't fail when removing nonexistent files in move_file
-* Wed Apr 08 2009 agruen@suse.de
-- Version 2.5.9.109:
-  + Preserve timestamps in reject files.
-  + Add support for sending output to standard output.
-  + Allow special characters in filenames read interactively.
-  + Don't forget to NUL terminate ptimestr in fetchname().
-* Tue Apr 07 2009 agruen@suse.de
-- Version 2.5.9.104: timestamp parsing fix, 64-bit fix.
-* Mon Apr 06 2009 agruen@suse.de
-- Version 2.5.9.97: Another bugfix.
-* Mon Apr 06 2009 agruen@suse.de
-- Version 2.5.9.95: Gnulib update, bug fixes.
-* Fri Apr 03 2009 agruen@suse.de
-- Update to version patch-2.5.9.77: updated manpage and NEWS, no
-  strict depenency on ed in the test suite anymore, and slightly
-  improved handling of asymmetric hunks.
-* Thu Apr 02 2009 agruen@suse.de
-- Update to version patch-2.5.9.69 which has all our patches
-  merged in one form or anther, along with many other fixes and
-  improvements (see NEWS).
-* Tue Feb 24 2009 agruen@suse.de
-- Include patch headers in reject files so that they form proper
-  patches themselves.
-- Rewrite the unified reject files patch; this is much cleaner
-  now.
-- Add an improved strategy for locating merges.
-* Tue Feb 03 2009 agruen@suse.de
-- Implement diff3-style merges (including several fixes and
-  improvements).
-* Wed Apr 23 2008 agruen@suse.de
-- remember-backup-files.diff: Fix bug when a file is touched by
-  the same patch more than twice. Move the test cases from the
-  patch header into separate files.
-- patch-2.5.9-cat_if_device.diff: No need to remember the device
-  we write to as a backup file.
-* Fri Nov 02 2007 agruen@suse.de
-- Patch fails to apply hunks with asymmetric context correctly.
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Thu Jan 12 2006 agruen@suse.de
-- remember-backup-files.diff: Fix case where a patch modifies a
-  read-only file more than once while --backup is used (test case
-  in the patch header).
-* Thu Aug 18 2005 mmj@suse.de
-- --reject-unified is called --unified-reject-files [#105151]
-* Wed Jun 29 2005 mmj@suse.de
-- Don't compile with -f-signed-char [#93883]
-- Don't strip explicitly
-* Tue Jan 04 2005 mmj@suse.de
-- Add patch to make patch able to write reject files to devices,
-  named pipes and sockets [#45794]
-* Sun Jan 25 2004 agruen@suse.de
-- Add --reject-unified option to produce unified reject files:
-  Before, unified reject files were produced if the patch itself
-  was unified; this could sometimes have been annoying.
-- If a patch with C function names (diff -p) has rejects, include
-  the function names in the reject files.
-* Sun Jan 11 2004 adrian@suse.de
-- add %%defattr
-* Tue Oct 07 2003 agruen@suse.de
-- remember-backup-files: Also include the file timestamps in the
-  hash table for non-POSIX-compliant systems that don't guarantee
-  that i_dev + i_ino uniquely identifies a file.
-- #32031: Create --global-reject-file even if --dry-run is
-  specified. Add a missing '\n'.
-* Wed Jul 16 2003 agruen@suse.de
-- Replace trailing-cr-fix.diff with official upstream version that
-  fixes this bug differently.
-* Mon Jun 30 2003 agruen@suse.de
-- trailing-cr-fix.diff: Fix a bug in carriage return detection
-  (DOS files) in the unified diff path.
-- Disable patch that adds comments to C preprocessor style
-  merges, as specified by POSIX.1-2001.
-* Wed Jun 25 2003 agruen@suse.de
-- Fix bug introduced on June 5 that broke remember-backup-files.
-* Tue Jun 24 2003 agruen@suse.de
-- smart-reject-file-format.diff: Work around a special case in
-  which patches are not terminated with a '^' in the internal
-  representation. The resulting error message was "internal error
-  in abort_hunk".
-* Thu Jun 05 2003 agruen@suse.de
-- Temporary reject file logic: Ooops, now must only close the
-  temporary reject file after processing all patches, instead of
-  after each patch.
-* Thu Jun 05 2003 agruen@suse.de
-- Upgrade to 2.5.9: Several fixes, obsoletes
-  rename-same-file.patch.
-- Fix and adapt global-reject-file patch:
-  + The global reject file included corrupted headers for each
-  rejected hunk, instead of one header for each file with
-  rejects.
-  + Rename --global-reject to --global-reject-file.
-  + Simplify temporary reject file logic.
-  + Adapt to unified-reject-files patch (which has different
-  headers).
-  + Add entry in man page.
-- Fix a bug in smart-reject-file-format: Files that are created
-  are identified by `-0,0'; before the patch was generating
-  `-1,0' in reject files.
-- Switch remember-backup-files.diff over to use gnulib's hash
-  tables instead of glibc's binary trees, requested from upstream
-  to ensure greater portability.
-- Add /* SYM */ comment to #endif lines for patch -D SYM, too.
-* Wed Apr 09 2003 agruen@suse.de
-- Fix another bug with hard links and backup file generation.
-- Fix backup file generation if the same file appears in the
-  patch more than once.
-* Wed Mar 26 2003 mmj@suse.de
-- Update to 2.5.8:
-  + Bugfixes
-  + patch -D now outputs preprocessor lines without comments, as
-  required by POSIX 1003.1-2001
-  + File names in context patches may now contain spaces, so long
-  as the context patch headers use a tab to separate the file name
-  from the time stamp
-  + Perforce is now supported
-  + Patch lines beginning with "#" are comments and are ignored
-* Wed Jan 15 2003 agruen@suse.de
-- Fix a bug with hardlinks (see rename-same-file.patch)
-* Tue Sep 17 2002 ro@suse.de
-- removed bogus self-provides
-* Wed Feb 06 2002 coolo@suse.de
-- called suse_update_config
-* Mon Jun 25 2001 uli@suse.de
-- added patch adding "--global-reject" option by ak@suse.de
-- bzipped tarball
-* Tue Mar 06 2001 bk@suse.de
-- update to 2.5.4, added 2 patches from PLD and use buildroot
-* Wed Nov 08 2000 uli@suse.de
-- now builds with -D_GNU_SOURCE, should avoid miscompilation that
-  breaks LFS support
-- added fix for offset output by Alessandro Rubini
-- added fix and enhancement for --ifdef by Pete Buechler
-* Sun Feb 27 2000 @suse.de
-- added missing CFLAGS quotes.
-* Sun Feb 27 2000 bk@suse.de
-- added PPC fixes by Uli back again (-fsigned-char, CPPFLAGS)
-* Fri Feb 25 2000 schwab@suse.de
-- Specfile cleanup, get rid of Makefile.Linux
-- /usr/man -> /usr/share/man
-- Add group tag.
-* Mon Sep 13 1999 bs@suse.de
-- ran old prepare_spec on spec file to switch to new prepare_spec.
-* Wed Aug 18 1999 uli@suse.de
-- fixed for PPC (-fsigned-char, CPPFLAGS)
-* Tue Mar 16 1999 ro@suse.de
-- update to 2.5.3 using diff from jurix
-* Wed Jan 13 1999 bs@suse.de
-- applied patch from Egbert Eich (problems with non existing files fixed)
-* Thu Nov 05 1998 ro@suse.de
-- use libc's basename() for glibc