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

auto-import changelog data from patch-2.5.4-9.src.rpm

Browse Source 
Fri Dec 01 2000 Tim Waugh <twaugh@redhat.com>
- Rebuild because of fileutils bug.
Thu Nov 02 2000 Tim Waugh <twaugh@redhat.com>
- use .orig as default suffix, as per man page and previous behaviour (bug
    #20202).
- use better patch for this, from maintainer.
Wed Oct 04 2000 Tim Waugh <twaugh@redhat.com>
- actually use the RPM_OPT_FLAGS
This commit is contained in:
cvsdist 2004-09-09 09:54:15 +00:00
parent f236e9b323
commit 95e0480438
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patch-2.5.4-suffix.patch Normal file
View File

@ -0,0 +1,12 @@
--- patch-2.5.4/patch.c.suffix Thu Nov 2 17:57:46 2000
+++ patch-2.5.4/patch.c Thu Nov 2 17:58:25 2000
@@ -145,8 +145,7 @@
: posixly_correct - 1);
val = getenv ("SIMPLE_BACKUP_SUFFIX");
- if (val && *val)
- simple_backup_suffix = val;
+ simple_backup_suffix = val && *val ? val : ".orig";
if ((version_control = getenv ("PATCH_VERSION_CONTROL")))
version_control_context = "$PATCH_VERSION_CONTROL";

18
patch.spec
View File

@ -1,12 +1,13 @@
Summary: The GNU patch command, for modifying/upgrading files.
Name: patch
Version: 2.5.4
Release: 4
Release: 9
Copyright: GPL
URL: http://www.gnu.org/software/patch/patch.html
Group: Development/Tools
Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz
Patch1: patch-2.5-stderr.patch
Patch2: patch-2.5.4-suffix.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root
%description
@ -22,10 +23,10 @@ applications.
%prep
%setup -q
%patch1 -p1 -b .stderr
%patch2 -p1 -b .suffix
%build
REAL_CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
%define optflags \$REAL_CFLAGS
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
%configure
# XXX unset CPPFLAGS on (ultra?)sparc to avoid large file system support
@ -49,6 +50,17 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/*/*
%changelog
* Fri Dec 1 2000 Tim Waugh <twaugh@redhat.com>
- Rebuild because of fileutils bug.
* Thu Nov 2 2000 Tim Waugh <twaugh@redhat.com>
- use .orig as default suffix, as per man page and previous behaviour
(bug #20202).
- use better patch for this, from maintainer.
* Wed Oct 4 2000 Tim Waugh <twaugh@redhat.com>
- actually use the RPM_OPT_FLAGS
* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
- automatic rebuild