diff --git a/arc-gcc4.patch b/arc-gcc4.patch new file mode 100644 index 0000000..5d4f214 --- /dev/null +++ b/arc-gcc4.patch @@ -0,0 +1,18 @@ +--- 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 + #include ++#include + #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 */ diff --git a/arc.spec b/arc.spec index 2482d1d..48b726e 100644 --- a/arc.spec +++ b/arc.spec @@ -1,6 +1,6 @@ Name: arc Version: 5.21j -Release: 3 +Release: 4 Summary: Arc archiver @@ -8,6 +8,7 @@ Group: Applications/Archiving 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 @@ Arc file archiver and compressor. Long since superseded by zip/unzip 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 @@ rm -fr %{buildroot} %attr (0755,root,root) %{_bindir}/* %changelog +* Wed May 25 2005 Jeremy Katz - 5.21j-4 +- fix build with gcc4, patch from Nicolas Mailhot (#156225) + * Sun May 22 2005 Ralf Corsepius - Use RPM_OPT_CFLAGS inside of Makefile.