From 7db9f751ceeecd1225d1d8dc8294921484df6c76 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Sat, 30 Aug 2008 14:13:26 +0000
Subject: [PATCH] - Corrected from %patch to %patch0 to make rpm > 4.4 happy -
 Fix missing prototype compiler warnings

---
 arj-3.10.22-missing-protos.patch | 34 ++++++++++++++++++++++++++++++++
 arj.spec                         | 18 ++++++++++++-----
 2 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 arj-3.10.22-missing-protos.patch

diff --git a/arj-3.10.22-missing-protos.patch b/arj-3.10.22-missing-protos.patch
new file mode 100644
index 0000000..90061e5
--- /dev/null
+++ b/arj-3.10.22-missing-protos.patch
@@ -0,0 +1,34 @@
+diff -up arj-3.10.22/environ.c~ arj-3.10.22/environ.c
+--- arj-3.10.22/environ.c~	2008-03-31 15:19:36.000000000 +0200
++++ arj-3.10.22/environ.c	2008-03-31 15:19:36.000000000 +0200
+@@ -12,6 +12,8 @@
+ #include <conio.h>
+ #include <io.h>
+ #include <process.h>
++#else
++#include <sys/wait.h>
+ #endif
+ 
+ #include <fcntl.h>
+diff -up arj-3.10.22/arjsfx.c~ arj-3.10.22/arjsfx.c
+--- arj-3.10.22/arjsfx.c~	2008-03-31 15:17:45.000000000 +0200
++++ arj-3.10.22/arjsfx.c	2008-03-31 15:17:45.000000000 +0200
+@@ -5,6 +5,7 @@
+  *
+  */
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <signal.h>
+ 
+diff -up arj-3.10.22/arj.c~ arj-3.10.22/arj.c
+--- arj-3.10.22/arj.c~	2008-03-31 15:17:14.000000000 +0200
++++ arj-3.10.22/arj.c	2008-03-31 15:17:14.000000000 +0200
+@@ -5,6 +5,7 @@
+  *
+  */
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <signal.h>
+ 
diff --git a/arj.spec b/arj.spec
index 9282490..f0b0aab 100644
--- a/arj.spec
+++ b/arj.spec
@@ -1,15 +1,16 @@
 Name:           arj
 Version:        3.10.22
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Archiver for .arj files
 Group:          Applications/Archiving
 License:        GPL+
 URL:            http://arj.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # unarj.* from Debian.
 Source1:        unarj.sh
 Source2:        unarj.1
 Patch0:         http://ftp.debian.org/debian/pool/main/a/%{name}/%{name}_%{version}-2.diff.gz
+Patch1:         arj-3.10.22-missing-protos.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf
 Provides:       unarj = %{version}-%{release}
@@ -24,10 +25,11 @@ provided by ARJ Software, Inc.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 for i in debian/patches/00*.patch; do
   patch -p1 < $i
 done
+%patch1 -p1
 pushd gnu
   autoconf
 popd
@@ -67,8 +69,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Aug 13 2007 Robert Scheck <robert@fedoraproject.org> 3.10.22-3
-- Rebuilt for EPEL branches (#250845)
+* Sat Aug 30 2008 Robert Scheck <robert@fedoraproject.org> 3.10.22-5
+- Corrected from %%patch to %%patch0 to make rpm > 4.4 happy
+
+* Mon Mar 31 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 3.10.22-4
+- Fix missing prototype compiler warnings
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.10.22-3
+- Autorebuild for GCC 4.3
 
 * Fri Aug  3 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 3.10.22-2
 - Update License tag for new Licensing Guidelines compliance