BitchX poprawki
Arkadiusz Miśkiewicz
misiek w zsz2.starachowice.pl
Pią, 2 Paź 1998, 09:14:35 CEST
Poprawilem troche speca od BitchX
* Thu Oct 01 1998 Arkadiusz Miśkiewicz <misiek w misiek.eu.org>
- wserv is now as wserv-bx (modifiet to avoid conflicts with others
irc clients)
- irclib is now ${prefix}/lib/BitchX
- added /usr/lib/BitchX with subdirectories
- modified pl translations
- added configuration /etc/irc/ircII.servers
- added help (from EPIC3 but should be from EPIC4!)
- added pl message in %post
- now BitchX uses /usr/lib/BitchX/BitchX.help instead ~/.BitchX/BitchX.help
- added Polish IRCNet servers to DEFAULT
d-developerzy (dodajacy literke "d" ;) przed przekompilowaniem
sciagniecie nowego helpa do EPIC4 z
ftp://ftp.acronet.net/pub/ircii/ircii*4*help.tar.gz
i umiesccie go w pakiecie.
Glownie moje poprawki mialy na celu unikniecie konfliktu z innymi irc-klientami
(np. z ircii-EPIC3, ircii-EPIC4 (traktowac jako 2 osobne wersje?), ircii-4.4)
Teraz rownoczesnie moge miec EPIC3'a i BitchX :)
Kilka uwag dla osob, ktore beda zajmowaly sie innymi irc-klientami:
- dla ircii-4.4 (jako podstawowego klienta ?) proponuje:
/usr/bin/irc
/usr/bin/wserv
/usr/lib/irc/...
- dla EPIC3
/usr/bin/epic3
/usr/bin/wserv-e3
/usr/lib/epic3/...
- dla EPIC4
/usr/bin/epic4
/usr/bin/wserv-e4
/usr/lib/epic4/...
- dla BitchX
/usr/bin/BitchX
/usr/bin/wserv-bx
/usr/lib/BitchX/...
- i tak dalej. Chodzi po prostu o zeby 2 rozne klienty irc nie kozystaly z tych
samych katalogow.
Aha .. wszystkie irc-klienty powinny korzystac z
/etc/irc/ircII.servers
jako pliku konfiguracyjnego z serwerami.
Pozdrawiam i przypominam, zeby nie tykac EPIC3'a ;)
--
-< Arkadiusz Miśkiewicz >------------------------< Cron on IRC >-
http://www.misiek.eu.org mailto:misiek w zsz2.starachowice.pl
Webmaster ZSZ2 http://www.zsz2.starachowice.pl
-< Linux micq UIN: 13798733 >-----------< Starachowice, POLAND >-
-------------- następna część ---------
diff -uNr BitchX/install-bitchx BitchX-new/install-bitchx
--- BitchX/install-bitchx Wed Dec 31 19:00:00 1969
+++ BitchX-new/install-bitchx Sat Dec 27 19:55:43 1997
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# This is the BitchX installation script for Red Hat Linux users
+# Made by ObiTuarY for the bitchx-73p2 .rpm
+
+echo
+echo Installing BitchX in your home directory...
+echo
+
+# The $HOME/.BitchX directory
+
+if [ -d $HOME/.BitchX ]; then echo $HOME/.BitchX exists... Ok; else mkdir $HOME/.BitchX; fi
+
+# Copying the files
+
+echo
+echo Copying the BitchX configuration files to your .BitchX directory
+echo
+
+if [ -e $HOME/.BitchX/BitchX.quit ]; then echo found BitchX.quit... Ok; else cp /usr/doc/BitchX*/BitchX.quit $HOME/.BitchX/; fi
+if [ -e $HOME/.BitchX/BitchX.reasons ]; then echo found BitchX.reasons... Ok; else cp /usr/doc/BitchX*/BitchX.reasons $HOME/.BitchX; fi
+
+# We're finished
+
+echo
+echo Installation Done, to run BitchX type BitchX
+echo
-------------- następna część ---------
diff -urN BitchX.orig/Makefile.in BitchX/Makefile.in
--- BitchX.orig/Makefile.in Thu Oct 1 21:56:30 1998
+++ BitchX/Makefile.in Thu Oct 1 21:56:50 1998
@@ -22,7 +22,7 @@
# Where the ircII library will be. Generally this is the place that
# you put the scripts, help pages and translation tables. It is
# very important that you set this correctly.
-IRCLIB = @IRCLIB@
+IRCLIB = ${prefix}/lib/BitchX
PMOS2 = @WITH_PM@
@@ -112,7 +112,7 @@
# INSTALL_HELP_CMD = @echo The help files have not been installed.
INSTALL_HELP_CMD = @INSTALL_HELP_CMD@
-INSTALL_WSERV = $(bindir)/wserv
+INSTALL_WSERV = $(bindir)/wserv-bx
INSTALL_SCRBX = $(bindir)/scr-bx
## You shouldn't have to change anything below here
diff -urN BitchX.orig/include/config.h BitchX/include/config.h
--- BitchX.orig/include/config.h Thu Oct 1 21:56:32 1998
+++ BitchX/include/config.h Thu Oct 1 22:09:35 1998
@@ -25,7 +25,7 @@
*/
#ifndef DEFAULT_SERVER
-#define DEFAULT_SERVER "[efnet] irc.cs.cmu.edu irc.primenet.com irc.total.net:6660 irc.phoenix.net irc.nwlink.com irc.nol.net [dalnet] irc.dal.org [fefnet] raistlin.toledolink.com irc.undernet.org::::undernet [other] irc.myweb.net irc.phrozen.org irc.openface.ca"
+#define DEFAULT_SERVER "[efnet] irc.cs.cmu.edu irc.primenet.com irc.total.net:6660 irc.phoenix.net irc.nwlink.com irc.nol.net [dalnet] irc.dal.org [fefnet] raistlin.toledolink.com irc.undernet.org::::undernet [other] irc.myweb.net irc.phrozen.org irc.openface.ca [ircnet] warszawa.irc.pl lublin.irc.pl krakow.irc.pl poznan.irc.pl"
#endif
/*
@@ -59,7 +59,7 @@
*
* This is ONLY for /server and 'server-like' connections, not for DCC.
*/
-#define CONNECT_TIMEOUT 20
+#define CONNECT_TIMEOUT 30
/*
* I moved this here because it seemed to be the most appropriate
@@ -134,7 +134,7 @@
#if defined(WINNT) || defined(__EMX__)
#define SERVERS_FILE "irc-seRv"
#else
-#define SERVERS_FILE "ircII.servers"
+#define SERVERS_FILE "/etc/irc/ircII.servers"
#endif
/* If you define UNAME_HACK, the uname information displayed in the
@@ -240,7 +240,7 @@
/*
* we define the default network type for server groups. Do not just * undefine this.
*/
- #define DEFAULT_NETWORK "efnet"
+ #define DEFAULT_NETWORK "ircnet"
/*
* defining this enables translation to occur. You need a copy of the
@@ -248,7 +248,7 @@
*/
#undef TRANSLATE
-#define TRANSLATION_PATH "/usr/local/lib/irc/tpanslation"
+#define TRANSLATION_PATH "/usr/lib/BitchX/translation"
/*
* Below are the IRCII variable defaults. For boolean variables, use 1 for
@@ -436,7 +436,7 @@
#else
#define DEFAULT_CTOOLZ_DIR "~/.BitchX"
#define DEFAULT_SCRIPT_HELP_FILE DEFAULT_CTOOLZ_DIR"/BitchX.help"
-#define DEFAULT_BITCHX_HELP_FILE DEFAULT_CTOOLZ_DIR"/BitchX.help"
+#define DEFAULT_BITCHX_HELP_FILE IRCLIB"BitchX.help"
#endif
#define DEFAULT_AINV 0
diff -urN BitchX.orig/source/Makefile.in BitchX/source/Makefile.in
--- BitchX.orig/source/Makefile.in Thu Oct 1 21:56:33 1998
+++ BitchX/source/Makefile.in Thu Oct 1 22:18:44 1998
@@ -53,7 +53,7 @@
vars.o: Makefile ../Makefile
$(CC) $(CFLAGS) $(PMOS2) $(TCL) $(CD_PLAY) -D_VERSION_=\"$(_VERSION_)\" $(PP_DEFS) $(INCLUDES) \
- -DDEFAULT_HELP_PATH=\"$(HELP_DIR)\" -c vars.c
+ -DDEFAULT_HELP_PATH=\"$(HELP_DIR)\" -DIRCLIB=\"$(IRCLIB)/\" -c vars.c
help.o: Makefile ../Makefile
$(CC) $(CFLAGS) $(PMOS2) $(TCL) $(CD_PLAY) $(PP_DEFS) $(INCLUDES) \
diff -urN BitchX.orig/source/server.c BitchX/source/server.c
--- BitchX.orig/source/server.c Thu Oct 1 21:56:33 1998
+++ BitchX/source/server.c Thu Oct 1 21:57:54 1998
@@ -663,7 +663,7 @@
}
#ifdef SERVERS_FILE
- malloc_sprintf(&file_path, "%s%s", irc_lib, SERVERS_FILE);
+ malloc_sprintf(&file_path, "%s", SERVERS_FILE);
some += read_and_parse_server(&file_path, buffer);
new_free(&file_path);
#endif
diff -urN BitchX.orig/source/translat.c BitchX/source/translat.c
--- BitchX.orig/source/translat.c Thu Oct 1 21:56:35 1998
+++ BitchX/source/translat.c Thu Oct 1 21:56:50 1998
@@ -32,7 +32,7 @@
#include "hebrew.h"
#ifndef TRANSLATION_PATH
-#define TRANSLATION_PATH "/usr/local/lib/irc/translation"
+#define TRANSLATION_PATH "/usr/lib/BitchX/translation"
#endif
-------------- następna część ---------
Summary: Improved color IRC client with built-in scripts
Summary(pl): Ulepszony kolorowy klient IRC z wbudowanymi skryptami
Name: BitchX
Version: 75
Release: 2
Source0: ftp://ftp.bitchx.com/pub/BitchX/source/ircii-pana-%{version}.tar.gz
Source1: ircII.servers
# Zanim zrekompilujesz pakiet sciagnij nowszego helpa z:
#Source2: ftp.acronet.net/pub/ircii/epic4???-help.tar.gz
Source2: epic3.004-help.tar.gz
Copyright: GPL
Group: Applications/Communications
Group(pl): Aplikacje/Komunikacja
Patch0: BitchX-75.patch
Patch1: BitchX.pld.diff
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
%description
BitchX is a popular ANSI color ircII client by panasync. It
incorporates various features that would normally require a
script. It's interface is more colorful and cleaner than ircII.
%description -l pl
BitchX jest popularnym klientem ircII. Jego interfejs jest bardziej
kolorowy i przejżysty niż sinterfejs standardowego kilienta ircII.
%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
%build
gzip -dc $RPM_SOURCE_DIR/epic3.004-help.tar.gz | tar -xf -
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
make all
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/{bin,lib/BitchX/{script,translation,help}}
install -d $RPM_BUILD_ROOT/etc/irc
strip source/BitchX
strip source/wserv
strip source/scr-bx
install $RPM_SOURCE_DIR/ircII.servers $RPM_BUILD_ROOT/etc/irc
install source/BitchX $RPM_BUILD_ROOT/usr/bin
install source/wserv $RPM_BUILD_ROOT/usr/bin/wserv-bx
install source/scr-bx $RPM_BUILD_ROOT/usr/bin
install install-bitchx $RPM_BUILD_ROOT/usr/bin
install BitchX.help $RPM_BUILD_ROOT/usr/lib/BitchX
cp -r help $RPM_BUILD_ROOT/usr/lib/BitchX
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644, root, root, 755)
%doc Changes doc/* BitchX.quit BitchX.reasons
%attr(711, root, root) /usr/bin/BitchX
%attr(711, root, root) /usr/bin/wserv-bx
%attr(711, root, root) /usr/bin/scr-bx
%attr(755, root, root) /usr/bin/install-bitchx
%attr(644, root, root, 755) /usr/lib/BitchX
%attr(644, root, root, 755) %config(noreplace) /etc/irc/ircII.servers
%post
echo "Type \"install-bitchx\" to install the configuration files to your home directory."
echo "Wpisz \"install-bitchx\" by zainstalować pliki konfiguracyjne w Twoim \$HOME."
%changelog
* Thu Oct 01 1998 Arkadiusz Miśkiewicz <misiek w misiek.eu.org>
- wserv is now as wserv-bx (modifiet to avoid conflicts with others
irc clients)
- irclib is now ${prefix}/lib/BitchX
- added /usr/lib/BitchX with subdirectories
- modified pl translations
- added configuration /etc/irc/ircII.servers
- added help (from EPIC3 but should be from EPIC4!)
- added pl message in %post
- now BitchX uses /usr/lib/BitchX/BitchX.help instead ~/.BitchX/BitchX.help
- added Polish IRCNet servers to DEFAULT
* Thu Aug 13 1998 Wojtek Slusarczyk <wojtek w shadow.eu.org>
- build against glibc-2.1,
- translation modified for pl,
- changed build root to /tmp/bitchx ( Andrzej... Andrzej fonetyka ;)
- changed permissions of ELF binaries to 711.
* Thu Jul 02 1998 Rod Cordova <rcordova w ethernet.org>
- Applied the dcc.c fix to the source code
* Wed Jul 01 1998 Rod Cordova <rcordova w ethernet.org>
- Upgraded to version 75
- incorporated the tcl-1.5-linux.o object into the binary for tcl support
* Thu Apr 02 1998 Rod Cordova <rcordova w ethernet.org>
- fixed the post install since it was not echo'ing properly after install
- applied the fixpack74p4.tgz to the source code
- incorporated the tcl.o object into the binary for tcl support
- stripped the BitchX binary and the wserv binary to reduce the size of
the package
* Sat Mar 28 1998 Rod Cordova <rcordova w ethernet.org>
- upgraded to version 74p4
* Fri Feb 27 1998 Andrzej K. Brandt <andy w monk.cs.net.pl>
- upgraded to patchlevel 2
* Sun Feb 15 1998 Andrzej K. Brandt <andy w monk.cs.net.pl>
- backported from an SRPM made for RH 5.0 distribution (glibc)
-------------- następna część ---------
warszawa.irc.pl:6667
lublin.irc.pl:6667
krakow.irc.pl:6667
poznan.irc.pl:6667
Więcej informacji o liście dyskusyjnej pld-devel-pl