speclint police: move ircd.patch into CVS and merge with ircd.freebsd.patch files

ircd/ircd.freebsd.patch

@@ -1,11 +0,0 @@
-diff -Naur irc2.10.3p3.orig/support/configure irc2.10.3p3/support/configure
---- irc2.10.3p3.orig/support/configure	Tue Jan 14 12:20:16 2003
-+++ irc2.10.3p3/support/configure	Tue Jan 14 12:29:41 2003
-@@ -1308,7 +1308,6 @@
- 
-     if echo "$irc_cv_solaris_2" | egrep "^2\.(0|1|2)" >/dev/null; then
-       cat >> confdefs.h <<\EOF
--#define SOLARIS_2_0_2_1_2_2 1
- EOF
- 
-     elif echo "$irc_cv_solaris_2" | grep "^2\.3" >/dev/null; then

ircd/ircd.patch

@@ -0,0 +1,28 @@
+--- common/os.h.orig	Thu Feb  3 18:57:00 2000
++++ common/os.h	Tue Oct 16 17:56:26 2001
+@@ -744,7 +744,7 @@
+ 						0, 0, 0, 0, 0};
+ # endif
+ 
+-# define IRCDCONF_DELIMITER '%'
++# define IRCDCONF_DELIMITER ';'
+ 
+ #else
+ # define	AFINET		AF_INET
+@@ -757,5 +757,5 @@
+ # define	IN_ADDR		in_addr
+ 
+ # define WHOSTENTP(x) (x)
+-# define IRCDCONF_DELIMITER ':'
++# define IRCDCONF_DELIMITER ';'
+ #endif
+--- support/configure	Tue Jan 14 12:20:16 2003
++++ support/configure	Tue Jan 14 12:29:41 2003
+@@ -1308,7 +1308,6 @@
+ 
+     if echo "$irc_cv_solaris_2" | egrep "^2\.(0|1|2)" >/dev/null; then
+       cat >> confdefs.h <<\EOF
+-#define SOLARIS_2_0_2_1_2_2 1
+ EOF
+ 
+     elif echo "$irc_cv_solaris_2" | grep "^2\.3" >/dev/null; then

ircd/ircd.spec

@@ -43,8 +43,7 @@ Source0:      ftp://ftp.irc.org/irc/server/irc%{version}.tgz
 Source1:      rc.ircd
 Source2:      ircd.conf
 Source3:      fsl.ircd
-Patch0:       irc%{version}.patch
-Patch1:       ircd.freebsd.patch
+Patch0:       ircd.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -69,12 +68,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n irc%{version}
-    %patch0 -p0
-    case "%{l_target}" in
-        *-freebsd* )
-        %patch1 -p1
-        ;;
-    esac
+    %patch -p0
 
 %build
     CC="%{l_cc}" \