rpms/arc/devel arc-gcc4.patch,NONE,1.1 arc.spec,1.8,1.9

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/rpms/arc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25521

Modified Files:
	arc.spec 
Added Files:
	arc-gcc4.patch 
Log Message:
* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 5.21j-4
- fix build with gcc4, patch from Nicolas Mailhot (#156225)


arc-gcc4.patch:

--- NEW FILE arc-gcc4.patch ---
--- arc-5.21j/marc.c.gcc4	2005-05-25 17:17:58.000000000 -0400
+++ arc-5.21j/marc.c	2005-05-25 17:18:39.000000000 -0400
@@ -28,6 +28,7 @@
 #if	UNIX
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <string.h>
 #endif
 
 #ifndef	__STDC__
@@ -48,7 +49,6 @@
 int nargs;			       /* number of arguments */
 char *arg[];			       /* pointers to arguments */
 {
-    char *makefnam();		       /* filename fixup routine */
     char *envfind();
 #if	!_MTS
     char *arctemp2, *mktemp();		/* temp file stuff */


Index: arc.spec
===================================================================
RCS file: /cvs/extras/rpms/arc/devel/arc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- arc.spec	23 May 2005 10:51:14 -0000	1.8
+++ arc.spec	25 May 2005 21:35:45 -0000	1.9
@@ -1,6 +1,6 @@
 Name:      arc
 Version:   5.21j
-Release: 3
+Release: 4
 
 Summary:   Arc archiver
 
@@ -8,6 +8,7 @@
 License:   GPL
 URL:       ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
 Source:    ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/%{name}-%{version}.tar.gz
+Patch0: arc-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -15,7 +16,8 @@
 but useful if you have old .arc files you need to unpack.
 
 %prep
-%setup
+%setup -q
+%patch0 -p1 -b .gcc4
 
 sed -i \
   -e 's,^OPT =.*$,OPT = ${RPM_OPT_FLAGS},' \
@@ -40,6 +42,9 @@
 %attr (0755,root,root) %{_bindir}/*
 
 %changelog
+* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 5.21j-4
+- fix build with gcc4, patch from Nicolas Mailhot (#156225)
+
 * Sun May 22 2005 Ralf Corsepius <ralf[AT]links2linux.de>
 - Use RPM_OPT_CFLAGS inside of Makefile.