X-Git-Url: http://git.pld-linux.org/?p=packages%2Feggdrop.git;a=blobdiff_plain;f=eggdrop.spec;h=22c2f23c917030165bf11e05bf113772d8d13258;hp=ec7a58ad18997eb26824ef5ff47d1ec9218f9471;hb=HEAD;hpb=6ab8ba23135bc2f63d82a926424b022b312ddaa2

diff --git a/eggdrop.spec b/eggdrop.spec
index ec7a58a..1e97929 100644
--- a/eggdrop.spec
+++ b/eggdrop.spec
@@ -1,72 +1,75 @@
+#
+# Conditional build:
 Summary:	Eggdrop is an IRC bot, written in C
-Summary(pl):	Eggdrop jest botem IRC napisanym w C
-Summary(pt_BR):	Bot de IRC escrito em C
-Summary(ru_RU):	Eggdrop, ÜÔÏ IRC-ÂÏÔ ÎÁÐÉÓÁÎÎÙÊ ÎÁ ÑÚÙËÅ C.
+Summary(pl.UTF-8):	Eggdrop jest botem IRC napisanym w C
+Summary(pt_BR.UTF-8):	Bot de IRC escrito em C
+Summary(ru.UTF-8):	Eggdrop, это IRC-бот написанный на языке C.
 Name:		eggdrop
-Version:	1.6.15
+Version:	1.8.3
 Release:	2
-License:	GPL
+License:	GPL v2
 Group:		Applications/Communications
-Source0:	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.bz2
-# Source0-md5:	68e181201483dee398f9904e8652e6ca
+Source0:	ftp://ftp.eggheads.org/pub/eggdrop/source/1.8/%{name}-%{version}.tar.gz
+# Source0-md5:	30b076b813a6b04f7421ab709309af7b
 # In order to unify filenames, following language packs and third-party modules were
 # repackaged. Some files were renamed, but none modified. Original archives can be
 # found by looking at http://www.egghelp.org/
-Source10:	http://pld.mysza.eu.org/sources/%{name}-language-danish.tar.gz
+Source10:	%{name}-language-danish.tar.gz
 # Source10-md5:	86b9bbab196f64b09e4daf2dec93fd50
-Source11:	http://pld.mysza.eu.org/sources/%{name}-language-finnish.tar.gz
+Source11:	%{name}-language-finnish.tar.gz
 # Source11-md5:	d720c6ad3f19deb8d51eeb753d0da390
-Source12:	http://pld.mysza.eu.org/sources/%{name}-language-italian.tar.gz
+Source12:	%{name}-language-italian.tar.gz
 # Source12-md5:	9c568bc516ecb202ed9e76c1523e4d6a
-Source13:	http://pld.mysza.eu.org/sources/%{name}-language-norwegian.tar.gz
+Source13:	%{name}-language-norwegian.tar.gz
 # Source13-md5:	118e14c8dfe0a6917e8e7b191a733e3f
-Source14:	http://pld.mysza.eu.org/sources/%{name}-language-portuguese.tar.gz
+Source14:	%{name}-language-portuguese.tar.gz
 # Source14-md5:	1b96f1ba51a0162665be892327c405cf
-Source15:	http://pld.mysza.eu.org/sources/%{name}-language-portuguese_br.tar.gz
+Source15:	%{name}-language-portuguese_br.tar.gz
 # Source15-md5:	93d4afae51dfa4cd7512fa6236868960
-Source16:	http://pld.mysza.eu.org/sources/%{name}-language-romanian.tar.gz
+Source16:	%{name}-language-romanian.tar.gz
 # Source16-md5:	3664b4f4870eb099d3a291284a076561
 # Additional modules taken from various places
-Source20:	http://pld.mysza.eu.org/sources/%{name}-module-away-1.0.tar.gz
+Source20:	%{name}-module-away-1.0.tar.gz
 # Source20-md5:	89b0529d024d8c29a855fb26e9e24a58
-Source21:	http://pld.mysza.eu.org/sources/%{name}-module-botnetop-1.0.1.tar.gz
+Source21:	%{name}-module-botnetop-1.0.1.tar.gz
 # Source21-md5:	1815a88748529d2ce6a221d560678285
-Source22:	http://pld.mysza.eu.org/sources/%{name}-module-fakebotnet-1.3.tar.gz
+Source22:	%{name}-module-fakebotnet-1.3.tar.gz
 # Source22-md5:	bf6e0ecc97bbe154137dba5f47c6e518
-Source23:	http://pld.mysza.eu.org/sources/%{name}-module-gseen-1.1.0.tar.gz
+Source23:	%{name}-module-gseen-1.1.0.tar.gz
 # Source23-md5:	d1b5ff929c360581647a2baf7281a7a6
-Source24:	http://pld.mysza.eu.org/sources/%{name}-module-irctree-1.1.tar.gz
+Source24:	%{name}-module-irctree-1.1.tar.gz
 # Source24-md5:	8bf884c57adbb131228fe47bffc69836
-Source25:	http://pld.mysza.eu.org/sources/%{name}-module-megahal-2.6b.tar.gz
+Source25:	%{name}-module-megahal-2.6b.tar.gz
 # Source25-md5:	1c8762d63d16c95bee3a2399614b8ac5
-Source26:	http://pld.mysza.eu.org/sources/%{name}-module-stats-1.3.3dev1.tar.gz
-# Source26-md5:	f50299b06dc9c8d29f7abb19defaa917
-Source27:	http://pld.mysza.eu.org/sources/%{name}-module-idea-1.0.2.tar.gz
+
+Source27:	%{name}-module-idea-1.0.2.tar.gz
 # Source27-md5:	dce4a43dfcfb72e143c71e8f6c6fc8c8
-Source28:	http://pld.mysza.eu.org/sources/%{name}-module-twofish-1.0.tar.gz
+Source28:	%{name}-module-twofish-1.0.tar.gz
 # Source28-md5:	861957c170b4af105199202e724be2a3
-Source29:	http://pld.mysza.eu.org/sources/%{name}-module-rijndael-1.0.tar.gz
-# Source29-md5:	0210476c24ed6f24e1fdc1cbab41a863
+#Source29:	%{name}-module-rijndael-1.0.tar.gz
+# http://eggdrop.msk.ru/files/irc/eggdrop1.6.19-patch-sp0009+SSL.tar.bz2
+Source30:	http://eggdrop.msk.ru/files/irc/%{name}1.6.19-patch-sp0009.tar.bz2
+# Source30-md5:	37df8dbb76a2b2283e2e80c182dc9967
 Patch0:		%{name}-FHS.patch
 Patch1:		%{name}-doc_makefile.patch
-# Multilevel sharing patch - now it is possible to create *secure* multilevel
-# botnets, each bot will only accept changes to userlist from bot that acts as
-# hub to him, and rejects changes from leaves
-Patch2:		ftp://ftp.eggheads.org/pub/%{name}/patches/1.6/multilevel_sharing%{version}.patch
-# Topicprot - protects channel topic from being changed
-# This patch was a bit modified to apply to eggdrop1.6.13
-Patch3:		ftp://ftp.eggheads.org/pub/%{name}/patches/1.6/topicprot%{version}.patch
-# Adds information about additional encryption modules to config file
+
+# http://www.egghelp.org/files.htm#patches
+
 Patch4:		%{name}-config_encryption.patch
-# This one fixes eggdrop botchk/autobotchk scripts
 Patch5:		%{name}-autobotchk.patch
-Patch6:		%{name}-ac_fix.patch
-# Taken from www.egghelp.org
-Patch7:		%{name}-ssl.patch
-Patch8:		%{name}-amd64.patch
+# http://www.egghelp.org/files.htm#patches
+
+Patch7:		%{name}-nolibs.patch
+
+Patch9:		%{name}-nmu.patch
+
+Patch12:	%{name}-build.patch
 URL:		http://www.eggheads.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	tcl-devel
 Requires:	tcl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -101,14 +104,14 @@ list of new features as opposed to vanilla eggdrop:
 For more information, see README.PLD.en file located under
 %{_docdir}/%{name}-%{version}
 
-%description -l pl
-Eggdrop jest IRCowym botem napisanym w C. Eggdrop, bêd±c botem jest na
-kanale i zajmuje siê jego ochron±: zabezpieczeniem przed przejêciem,
-nadawaniem odpowiednich przywilejów zarejestrowanym u¿ytkownikom,
-pilnowanie tzw. banów itp. Eggdrop poza tymi funkcjami posiada tak¿e
-wiele dodatków, jak przesy³anie plików czy inne skrypty dla rozrywki.
-Oto lista nowych mo¿liwo¶ci w odró¿nieniu od 'czystego' eggdropa:
-- Dodatkowe modu³y, takie jak:
+%description -l pl.UTF-8
+Eggdrop jest IRCowym botem napisanym w C. Eggdrop, będąc botem jest na
+kanale i zajmuje się jego ochroną: zabezpieczeniem przed przejęciem,
+nadawaniem odpowiednich przywilejów zarejestrowanym użytkownikom,
+pilnowanie tzw. banów itp. Eggdrop poza tymi funkcjami posiada także
+wiele dodatków, jak przesyłanie plików czy inne skrypty dla rozrywki.
+Oto lista nowych możliwości w odróżnieniu od 'czystego' eggdropa:
+- Dodatkowe moduły, takie jak:
   - away
   - botnetop
   - fakebotnet
@@ -116,56 +119,58 @@ Oto lista nowych mo
   - irctree
   - megahal
   - stats
-  - trzy nowe modu³y szyfruj±ce: idea, twofish, rijndael
+  - trzy nowe moduły szyfrujące: idea, twofish, rijndael
 - Dodatkowe
-  - duñski
-  - fiñski
-  - w³oski
+  - duński
+  - fiński
+  - włoski
   - norweski
   - portugalski
   - brazylijska odmiana portugalskiego
-  - rumuñski
-- Zaaplikowano ró¿ne mniejsze lub wiêksze ³aty
-Wiêcej informacji znajdziesz w pliku README.PLD.pl znajduj±cym siê
+  - rumuński
+- Zaaplikowano różne mniejsze lub większe łaty
+Więcej informacji znajdziesz w pliku README.PLD.pl znajdującym się
 w katalogu %{_docdir}/%{name}-%{version}
 
-%description -l pt_BR
-Eggdrop é um bot de IRC, escrito em linguagem C.
+%description -l pt_BR.UTF-8
+Eggdrop é um bot de IRC, escrito em linguagem C.
 
 Eggdrop, sendo um bot, permanece em um canal e toma medidas de
-proteç?o: evitando que o canal seja tomado (usando as poucas maneiras
-possíveis), reconhecendo usuários ou sites expulsos e os rejeitando,
-reconhecendo usuários privilegiados e permitindo que estes recebam OPS
+proteç?o: evitando que o canal seja tomado (usando as poucas maneiras
+possíveis), reconhecendo usuários ou sites expulsos e os rejeitando,
+reconhecendo usuários privilegiados e permitindo que estes recebam OPS
 etc.
 
-%description -l ru_RU.KOI8-R
-Eggdrop, ÜÔÏ IRC-ÂÏÔ ÎÁÐÉÓÁÎÎÙÊ ÎÁ ÑÚÙËÅ C. åÓÌÉ ×Ù ÎÅ ÚÎÁÅÔÅ,
-ÞÔÏ ÔÁËÏÅ IRC, ÔÏ ÜÔÏ ×ÅÒÏÑÔÎÏ ÎÅ ÔÏ, ÞÔÏ ×Ù ÉÝÅÔÅ!
-Eggdrop ÎÁÈÏÄÉÔÓÑ ÎÁ ËÁÎÁÌÅ × ÃÅÌÑÈ ÏËÁÚÁÎÉÑ ÚÁÝÉÔÎÙÈ ÍÅÒ:
-ÏÈÒÁÎÙ ËÁÎÁÌÁ ÏÔ ÐÅÒÅÈ×ÁÔÁ ÕÐÒÁ×ÌÅÎÉÑ ÚÌÏÕÍÙÛÌÅÎÎÉËÁÍÉ,
-ÒÁÓÐÏÚÎÏ×ÁÎÉÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ ÉÌÉ ÓÁÊÔÏ×, ÄÌÑ ËÏÔÏÒÙÈ ËÁÎÁÌ
-ÂÌÏËÉÒÏ×ÁÎ, Ó ÐÏÓÌÅÄÕÀÝÉÍ ÏÔËÁÚÏÍ × ÄÏÓÔÕÐÅ,
-ÒÁÓÐÏÚÎÁ×ÁÎÉÑ ÏÐÅÒÁÔÏÒÏ× ËÁÎÁÌÁ, Ó ÐÒÉÓ×ÏÅÎÉÅÍ ÉÍ
-ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÉÈ ÐÒÁ× É ÐÒÉ×ÉÌÅÇÉÊ.
+%description -l ru.UTF-8
+Eggdrop, это IRC-бот написанный на языке C. Если вы не знаете,
+что такое IRC, то это вероятно не то, что вы ищете!
+Eggdrop находится на канале в целях оказания защитных мер:
+охраны канала от перехвата управления злоумышленниками,
+распознования пользователей или сайтов, для которых канал
+блокирован, с последующим отказом в доступе,
+распознавания операторов канала, с присвоением им
+соответствующих прав и привилегий.
 
 %prep
-%setup -q -n %{name}%{version} -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29
+%setup -q -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a20 -a21 -a22 -a23 -a24 -a25 -a27 -a28 -a30
+mv aclocal.m4 acinclude.m4
 %patch0 -p1
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
+%patch1 -p1
+
 %patch4 -p1
 %patch5 -p1
-%patch6 -p0
 %patch7 -p1
-%patch8 -p1
+
+#%patch9 -p0 - wtf is this?
+
+%patch12 -p1
+
+# detect threaded tcl version
+sed -i -e 's#TclpFinalizeThreadData#Tcl_FinalizeThread#g' acinclude.m4
 
 %build
-# Author of eggdrop should go read some docs... a lot of docs
-# It's either ipv6 support or async dns module... I don't know which is more
-# important so I disabled ipv6... anybody cares to correct me? -- mmazur
-mv aclocal.m4 acinclude.m4
-cp -f /usr/share/automake/config.sub .
+cp -f /usr/share/automake/config.sub misc/
+cp -f %{name}.conf doc/%{name}.conf.example
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
@@ -174,54 +179,39 @@ cd src/mod/compress.mod
 %configure
 cd ../dns.mod
 %{__autoconf}
-%configure #--enable-ipv6
+%configure
 cd ../../..
-%configure #--enable-ipv6
+%configure \
+	--enable-tcl-threads \
+	--enable-ipv6
 %{__make} config
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/modules,%{_datadir}/%{name},%{_mandir}/man1,%{_datadir}/%{name}/{help,scripts,language},%{_datadir}/doc/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/modules,%{_mandir}/man1,%{_datadir}/%{name}}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	INSTALL="install -p" \
+	DEST=$RPM_BUILD_ROOT
 
 mv $RPM_BUILD_ROOT/%{name}-%{version} $RPM_BUILD_ROOT%{_bindir}/%{name}
+mv $RPM_BUILD_ROOT{/{text/*,help,scripts,language},%{_datadir}/%{name}/}
+mv $RPM_BUILD_ROOT/modules/* $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/
+mv $RPM_BUILD_ROOT{/doc,%{_mandir}}/man1/%{name}.1
+rm -rf $RPM_BUILD_ROOT/{doc,README,logs,eggdrop.conf}
+%{__rm} $RPM_BUILD_ROOT/{eggdrop,modules}
 
-find $RPM_BUILD_ROOT/doc -type f | egrep -v "(\.html$|\.htm$)" | xargs gzip -9nf
-gzip -9nf $RPM_BUILD_ROOT/README $RPM_BUILD_ROOT/%{name}.conf
-
-cp $RPM_BUILD_ROOT/doc/man1/%{name}.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1.gz
-rm -r $RPM_BUILD_ROOT/doc/man1
-
-cp -a $RPM_BUILD_ROOT/*.gz \
-	$RPM_BUILD_ROOT/doc/* \
-	$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
-cp -a $RPM_BUILD_ROOT/doc/modules $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-
-cp -a $RPM_BUILD_ROOT/text/* \
-	$RPM_BUILD_ROOT/help/ \
-	$RPM_BUILD_ROOT/scripts/ \
-	$RPM_BUILD_ROOT/language/ \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/
-
-cp -a $RPM_BUILD_ROOT/modules/* \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/modules/
-
-# These are only to make /usr/lib/rpm/check-files happy(ier)
-# Is this somehow ugly?
-for i in modules modules-%{version} text help scripts language doc logs eggdrop.conf.gz README.gz; do
-	rm -rf $RPM_BUILD_ROOT/$i
-done
+rm -rf docs
+cp -a doc docs
+rm -rf docs/{man1,Makefile*}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %{_docdir}/%{name}-%{version}
+%doc docs/*
 %attr(755,root,root) %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/modules