parent
7599689248
commit
b0aad101df
@ -1,10 +0,0 @@
|
|||||||
--- patch-2.5.4/pch.c.stripcr 1999-08-30 07:20:08.000000000 +0100
|
|
||||||
+++ patch-2.5.4/pch.c 2005-04-29 16:39:40.000000000 +0100
|
|
||||||
@@ -419,7 +419,6 @@
|
|
||||||
if (s[0] == '+' && s[1] == '0' && !ISDIGIT (s[2]))
|
|
||||||
p_says_nonexistent[NEW] = 1 + ! p_timestamp[NEW];
|
|
||||||
p_indent = indent;
|
|
||||||
- p_strip_trailing_cr = strip_trailing_cr;
|
|
||||||
p_start = this_line;
|
|
||||||
p_sline = p_input_line;
|
|
||||||
retval = UNI_DIFF;
|
|
@ -1,7 +1,7 @@
|
|||||||
Summary: The GNU patch command, for modifying/upgrading files.
|
Summary: The GNU patch command, for modifying/upgrading files.
|
||||||
Name: patch
|
Name: patch
|
||||||
Version: 2.5.4
|
Version: 2.5.4
|
||||||
Release: 23
|
Release: 24
|
||||||
License: GPL
|
License: GPL
|
||||||
URL: http://www.gnu.org/software/patch/patch.html
|
URL: http://www.gnu.org/software/patch/patch.html
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
@ -11,7 +11,6 @@ Patch2: patch-2.5.4-suffix.patch
|
|||||||
Patch3: patch-2.5.4-sigsegv.patch
|
Patch3: patch-2.5.4-sigsegv.patch
|
||||||
Patch4: patch-2.5.4-ifdef.patch
|
Patch4: patch-2.5.4-ifdef.patch
|
||||||
Patch5: patch-2.5.4-program_name.patch
|
Patch5: patch-2.5.4-program_name.patch
|
||||||
Patch6: patch-stripcr.patch
|
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -31,7 +30,6 @@ applications.
|
|||||||
%patch3 -p1 -b .sigsegv
|
%patch3 -p1 -b .sigsegv
|
||||||
%patch4 -p1 -b .ifdef
|
%patch4 -p1 -b .ifdef
|
||||||
%patch5 -p1 -b .program_name
|
%patch5 -p1 -b .program_name
|
||||||
%patch6 -p1 -b .stripcr
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
|
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
|
||||||
@ -58,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 4 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-24
|
||||||
|
- Reverted last change (bug #154283, bug #156762).
|
||||||
|
|
||||||
* Fri Apr 29 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-23
|
* Fri Apr 29 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-23
|
||||||
- Applied patch from Toshio Kuratomi to avoid problems with DOS-format
|
- Applied patch from Toshio Kuratomi to avoid problems with DOS-format
|
||||||
newlines (bug #154283).
|
newlines (bug #154283).
|
||||||
|
Loading…
Reference in New Issue
Block a user