2006-12-19 00:17:23 +01:00
|
|
|
#
|
2009-04-02 18:49:52 +02:00
|
|
|
# spec file for package patch (Version 2.5.9.70)
|
2006-12-19 00:17:23 +01:00
|
|
|
#
|
2009-02-04 00:18:23 +01:00
|
|
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
2006-12-19 00:17:23 +01:00
|
|
|
#
|
2009-02-04 00:18:23 +01:00
|
|
|
# All modifications and additions to the file contributed by third parties
|
|
|
|
# remain the property of their copyright owners, unless otherwise agreed
|
|
|
|
# upon. The license for this file, and modifications and additions to the
|
|
|
|
# file, is the same license as for the pristine package itself (unless the
|
|
|
|
# license for the pristine package is not an Open Source License, in which
|
|
|
|
# case the license is the MIT License). An "Open Source License" is a
|
|
|
|
# license that conforms to the Open Source Definition (Version 1.9)
|
|
|
|
# published by the Open Source Initiative.
|
|
|
|
|
2007-11-02 10:40:24 +01:00
|
|
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
2006-12-19 00:17:23 +01:00
|
|
|
#
|
|
|
|
|
|
|
|
# norootforbuild
|
|
|
|
|
2009-04-02 18:49:52 +02:00
|
|
|
Url: ftp://alpha.gnu.org/gnu/diffutils/
|
|
|
|
%define ver 2.5.9-70-g71a9b5b
|
2008-04-24 01:49:14 +02:00
|
|
|
|
2007-11-02 10:40:24 +01:00
|
|
|
Name: patch
|
2009-04-02 18:49:52 +02:00
|
|
|
BuildRequires: ed
|
2007-11-02 10:40:24 +01:00
|
|
|
License: GPL v2 or later
|
|
|
|
Group: Productivity/Text/Utilities
|
|
|
|
AutoReqProv: on
|
2009-04-02 18:49:52 +02:00
|
|
|
Version: 2.5.9.70
|
|
|
|
Release: 1
|
2007-11-02 10:40:24 +01:00
|
|
|
Summary: GNU patch
|
2009-04-02 18:49:52 +02:00
|
|
|
Source: ftp://alpha.gnu.org/gnu/patch/patch-%ver.tar.gz
|
2007-11-02 10:40:24 +01:00
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
2006-12-19 00:17:23 +01:00
|
|
|
|
|
|
|
%description
|
|
|
|
The GNU patch program is used to apply diffs between original and
|
|
|
|
changed files (generated by the diff command) to the original files.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Authors:
|
|
|
|
--------
|
|
|
|
Larry Wall
|
|
|
|
Paul Eggert
|
|
|
|
|
|
|
|
%prep
|
2009-04-02 18:49:52 +02:00
|
|
|
%setup -n patch-%ver
|
2006-12-19 00:17:23 +01:00
|
|
|
|
|
|
|
%build
|
2009-04-02 18:49:52 +02:00
|
|
|
CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \
|
|
|
|
./configure --prefix=%{_prefix}
|
|
|
|
make #CPPFLAGS=""
|
|
|
|
|
|
|
|
%check
|
|
|
|
make check
|
2006-12-19 00:17:23 +01:00
|
|
|
|
|
|
|
%install
|
2009-04-02 18:49:52 +02:00
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
2006-12-19 00:17:23 +01:00
|
|
|
|
|
|
|
%files
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%doc NEWS README
|
|
|
|
/usr/bin/patch
|
|
|
|
%doc %{_mandir}/man1/patch.1.gz
|
2008-04-24 01:49:14 +02:00
|
|
|
|
2007-11-02 10:40:24 +01:00
|
|
|
%changelog
|
2009-04-02 18:49:52 +02:00
|
|
|
* 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).
|
2009-02-26 18:17:05 +01:00
|
|
|
* 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.
|
2009-02-04 00:18:23 +01:00
|
|
|
* Tue Feb 03 2009 agruen@suse.de
|
|
|
|
- Implement diff3-style merges (including several fixes and
|
|
|
|
improvements).
|
2008-04-24 01:49:14 +02:00
|
|
|
* 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
|
2007-11-02 10:40:24 +01:00
|
|
|
- Patch fails to apply hunks with asymmetric context correctly.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Jan 25 2006 mls@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- converted neededforbuild to BuildRequires
|
2008-04-24 01:49:14 +02:00
|
|
|
* Thu Jan 12 2006 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- 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).
|
2008-04-24 01:49:14 +02:00
|
|
|
* Thu Aug 18 2005 mmj@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- --reject-unified is called --unified-reject-files [#105151]
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Jun 29 2005 mmj@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- Don't compile with -f-signed-char [#93883]
|
|
|
|
- Don't strip explicitly
|
2008-04-24 01:49:14 +02:00
|
|
|
* Tue Jan 04 2005 mmj@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- Add patch to make patch able to write reject files to devices,
|
|
|
|
named pipes and sockets [#45794]
|
2008-04-24 01:49:14 +02:00
|
|
|
* Sun Jan 25 2004 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- 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.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Sun Jan 11 2004 adrian@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- add %%defattr
|
2008-04-24 01:49:14 +02:00
|
|
|
* Tue Oct 07 2003 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- 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'.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Jul 16 2003 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- Replace trailing-cr-fix.diff with official upstream version that
|
|
|
|
fixes this bug differently.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Mon Jun 30 2003 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- 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.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Jun 25 2003 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- Fix bug introduced on June 5 that broke remember-backup-files.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Tue Jun 24 2003 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- 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".
|
2008-04-24 01:49:14 +02:00
|
|
|
* Thu Jun 05 2003 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- Temporary reject file logic: Ooops, now must only close the
|
|
|
|
temporary reject file after processing all patches, instead of
|
|
|
|
after each patch.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Thu Jun 05 2003 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- 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.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Apr 09 2003 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- 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.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Mar 26 2003 mmj@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- Update to 2.5.8:
|
2009-02-26 18:17:05 +01:00
|
|
|
+ Bugfixes
|
|
|
|
+ patch -D now outputs preprocessor lines without comments, as
|
2006-12-19 00:17:23 +01:00
|
|
|
required by POSIX 1003.1-2001
|
2009-02-26 18:17:05 +01:00
|
|
|
+ File names in context patches may now contain spaces, so long
|
2006-12-19 00:17:23 +01:00
|
|
|
as the context patch headers use a tab to separate the file name
|
|
|
|
from the time stamp
|
2009-02-26 18:17:05 +01:00
|
|
|
+ Perforce is now supported
|
|
|
|
+ Patch lines beginning with "#" are comments and are ignored
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Jan 15 2003 agruen@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- Fix a bug with hardlinks (see rename-same-file.patch)
|
2008-04-24 01:49:14 +02:00
|
|
|
* Tue Sep 17 2002 ro@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- removed bogus self-provides
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Feb 06 2002 coolo@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- called suse_update_config
|
2008-04-24 01:49:14 +02:00
|
|
|
* Mon Jun 25 2001 uli@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- added patch adding "--global-reject" option by ak@suse.de
|
|
|
|
- bzipped tarball
|
2008-04-24 01:49:14 +02:00
|
|
|
* Tue Mar 06 2001 bk@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- update to 2.5.4, added 2 patches from PLD and use buildroot
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Nov 08 2000 uli@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- 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
|
2008-04-24 01:49:14 +02:00
|
|
|
* Sun Feb 27 2000 @suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- added missing CFLAGS quotes.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Sun Feb 27 2000 bk@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- added PPC fixes by Uli back again (-fsigned-char, CPPFLAGS)
|
2008-04-24 01:49:14 +02:00
|
|
|
* Fri Feb 25 2000 schwab@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- Specfile cleanup, get rid of Makefile.Linux
|
|
|
|
- /usr/man -> /usr/share/man
|
|
|
|
- Add group tag.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Mon Sep 13 1999 bs@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- ran old prepare_spec on spec file to switch to new prepare_spec.
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Aug 18 1999 uli@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- fixed for PPC (-fsigned-char, CPPFLAGS)
|
2008-04-24 01:49:14 +02:00
|
|
|
* Tue Mar 16 1999 ro@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- update to 2.5.3 using diff from jurix
|
2008-04-24 01:49:14 +02:00
|
|
|
* Wed Jan 13 1999 bs@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- applied patch from Egbert Eich (problems with non existing files fixed)
|
2008-04-24 01:49:14 +02:00
|
|
|
* Thu Nov 05 1998 ro@suse.de
|
2006-12-19 00:17:23 +01:00
|
|
|
- use libc's basename() for glibc
|