- final versions of patches from Michal Kaps <ciril@faf.net.pl>

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

diff --git a/BitchX-dcc-force-port.patch b/BitchX-dcc-force-port.patch
index 5cb5ff4b3d98bec495b83f28c5bfd2e0fc60b56e..91a7b8a01472d09607fb5b3807646e630fb2ebeb 100644 (file)
--- 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 b2d7b13ce7116c39a33490a37adaa279814c1d7f..dad7793934e0de66feed01f4679060be518a1080 100644 (file)
--- 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 b5c0deb65121fe3fc6ca7b8740287939e98bd638..45d77607216296b6c85ed0157e4bed07e0ecfe90 100644 (file)
--- 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 e83a091134bebf02e991a31e1f71d4d26e5015c4..a86a61ebaf3a7cf82d3d19f07732d437fd7c9e10 100644 (file)
--- 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 870f0d9268111c484b9dba4a554534b3ab11ce30..94c588892466904842d1b6df83d8d6dd37f7be24 100644 (file)
--- 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"