From 8d27b8a5831a0e8fdf5cb14fc96c1957c7d8aabc Mon Sep 17 00:00:00 2001 From: ankry Date: Thu, 13 Feb 2003 16:26:36 +0000 Subject: [PATCH] - final versions of patches from Michal Kaps Changed files: BitchX-dcc-force-port.patch -> 1.2 BitchX-doc.patch -> 1.2 BitchX-numver.patch -> 1.2 BitchX-versioned-tcl.patch -> 1.2 BitchX.spec -> 1.60 --- BitchX-dcc-force-port.patch | 13 ++----------- BitchX-doc.patch | 4 ++-- BitchX-numver.patch | 20 ++++++++++---------- BitchX-versioned-tcl.patch | 4 ++-- BitchX.spec | 8 ++++---- 5 files changed, 20 insertions(+), 29 deletions(-) diff --git a/BitchX-dcc-force-port.patch b/BitchX-dcc-force-port.patch index 5cb5ff4..91a7b8a 100644 --- a/BitchX-dcc-force-port.patch +++ b/BitchX-dcc-force-port.patch @@ -1,3 +1,5 @@ +Patch to enable forcing of the local port bitchx uses for DCC. + --- BitchX/include/vars.h.old Sun Nov 4 17:18:23 2001 +++ BitchX/include/vars.h Sun Nov 4 17:20:30 2001 @@ -89,6 +89,7 @@ @@ -31,14 +33,3 @@ #ifdef DCC_CNCT_PEND flags |= DCC_CNCT_PEND; #endif -#--- BitchX/source/modules.c.old Tue Feb 11 01:13:41 2003 -#+++ BitchX/source/modules.c Tue Feb 11 01:13:58 2003 -#@@ -1321,7 +1321,7 @@ -# -# int check_version(unsigned long required) -# { -#-unsigned const major, minor, need_major, need_minor; -#+unsigned long major, minor, need_major, need_minor; -# major = bitchx_numver / 10000; -# minor = (bitchx_numver / 100) % 100; -# need_major = required / 10000; diff --git a/BitchX-doc.patch b/BitchX-doc.patch index b2d7b13..dad7793 100644 --- a/BitchX-doc.patch +++ b/BitchX-doc.patch @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Feb 12 23:39:12 2003 -+++ configure.in Wed Feb 12 23:39:37 2003 +--- BitchX/configure.in.orig Wed Feb 12 23:39:12 2003 ++++ BitchX/configure.in Wed Feb 12 23:39:37 2003 @@ -880,7 +880,7 @@ IRCLIB="\${prefix}/BitchX" IRCPATH="\$(DEFAULT_CTOOLZ_DIR):\$(DEFAULT_CTOOLZ_DIR)/plugins:.:\$(PLUGINDIR):\$(INSTALL_SCRIPT):\$(IRCLIB)" diff --git a/BitchX-numver.patch b/BitchX-numver.patch index b5c0deb..45d7760 100644 --- a/BitchX-numver.patch +++ b/BitchX-numver.patch @@ -1,11 +1,11 @@ ---- BitchX/source/modules.c~ Mon Jan 8 07:24:22 2001 -+++ BitchX/source/modules.c Sun Dec 23 22:10:44 2001 -@@ -65,7 +65,7 @@ +--- BitchX/source/modules.c.orig Thu Feb 13 15:16:18 2003 ++++ BitchX/source/modules.c Thu Feb 13 15:19:15 2003 +@@ -1321,7 +1321,7 @@ - Function_ptr global_table[NUMBER_OF_GLOBAL_FUNCTIONS] = { NULL }; - extern int read_sockets(); --extern unsigned long bitchx_numver; -+extern const unsigned long bitchx_numver; - extern int identd; - - extern int (*dcc_open_func) (int, int, unsigned long, int); + int check_version(unsigned long required) + { +-unsigned long major, minor, need_major, need_minor; ++unsigned const major, minor, need_major, need_minor; + major = bitchx_numver / 10000; + minor = (bitchx_numver / 100) % 100; + need_major = required / 10000; diff --git a/BitchX-versioned-tcl.patch b/BitchX-versioned-tcl.patch index e83a091..a86a61e 100644 --- a/BitchX-versioned-tcl.patch +++ b/BitchX-versioned-tcl.patch @@ -1,5 +1,5 @@ ---- configure.in.orig Wed Feb 12 23:41:53 2003 -+++ configure.in Wed Feb 12 23:42:47 2003 +--- BitchX/configure.in.orig Wed Feb 12 23:41:53 2003 ++++ BitchX/configure.in Wed Feb 12 23:42:47 2003 @@ -575,7 +575,7 @@ tcllib=`echo $tcllib | sed s@.a@@` tcllib=`echo $tcllib | sed s@libtcl@tcl@` diff --git a/BitchX.spec b/BitchX.spec index 870f0d9..94c5888 100644 --- a/BitchX.spec +++ b/BitchX.spec @@ -13,7 +13,7 @@ Source2: %{name}.desktop Source3: %{name}-bxglobal.script Source4: %{name}.1.pl Patch0: %{name}-config.h.patch -#Patch1: %{name}-numver.patch +Patch1: %{name}-numver.patch Patch2: %{name}-dcc-force-port.patch Patch3: %{name}-doc.patch Patch4: %{name}-emacs.patch @@ -63,11 +63,11 @@ powtarzaj %prep %setup -q -n %{name} %patch0 -p1 -#%patch1 -p1 +%patch1 -p1 %patch2 -p1 -%patch3 -p0 +%patch3 -p1 %patch4 -p1 -%patch5 -p0 +%patch5 -p1 %build CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses" -- 2.44.0