This commit is contained in:
Peter Vrabec 2005-03-14 09:55:59 +00:00
parent bad0c1ade6
commit 1aa29f3857
2 changed files with 22 additions and 1 deletions

16
tar-1.15.1-gcc4.patch Normal file
View File

@ -0,0 +1,16 @@
Patch by Robert Scheck <redhat@linuxnetz.de> for tar >= 1.15.1, which makes tar
rebuildable using gcc 4.
--- tar-1.15.1/tests/genfile.c 2004-09-08 13:50:20.000000000 +0200
+++ tar-1.15.1/tests/genfile.c.gcc4 2005-03-13 16:25:15.000000000 +0100
@@ -60,8 +60,8 @@
/* Block buffer for sparse file */
char *buffer;
-static const char *argp_program_version = "genfile (" PACKAGE ") " VERSION;
-static const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
+const char *argp_program_version = "genfile (" PACKAGE ") " VERSION;
+const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
static char doc[] = N_("genfile generates data files for GNU paxutils test suite");
static struct argp_option options[] = {

View File

@ -1,7 +1,7 @@
Summary: A GNU file archiving program.
Name: tar
Version: 1.15.1
Release: 3
Release: 4
License: GPL
Group: Applications/Archiving
URL: http://www.gnu.org/software/tar/
@ -12,6 +12,7 @@ Patch6: tar-1.14-nolibrt.patch
Patch7: tar-1.14-err.patch
Patch8: tar-1.14-loneZeroWarning.patch
Patch9: tar-1.15.1-makeCheck.patch
Patch10: tar-1.15.1-gcc4.patch
Prereq: info
BuildRequires: autoconf automake gzip
Buildroot: %{_tmppath}/%{name}-%{version}-root
@ -35,6 +36,7 @@ the rmt package.
%patch7 -p1 -b .err
%patch8 -p1 -b .loneZeroWarning
%patch9 -p1 -b .makeCheck
%patch10 -p1 -b .gcc4
%build
@ -105,6 +107,9 @@ fi
%{_infodir}/tar.info*
%changelog
* Mon Mar 14 2005 Peter Vrabec <pvrabec@redhat.com>
- gcc4 fix (#150993) 1.15.1-4
* Mon Jan 31 2005 Peter Vrabec <pvrabec@redhat.com>
- rebuild 1.15.1-3