X-Git-Url: http://git.pld-linux.org/?p=packages%2Feggdrop.git;a=blobdiff_plain;f=eggdrop.spec;h=68cd1cc37eaeac5132a40d08bbc367c62f3249ba;hp=9f93bdb635f0d7ac73427a8d0764928d49073c1a;hb=f8ba2d0909e6dcf3780a1fd003de0ccf83e8debd;hpb=5f79289182467404aa6d999f2b88746e4c6aa4c2

diff --git a/eggdrop.spec b/eggdrop.spec
index 9f93bdb..68cd1cc 100644
--- a/eggdrop.spec
+++ b/eggdrop.spec
@@ -1,59 +1,66 @@
 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.KOI8-R): Eggdrop, ÜÔÏ IRC-ÂÏÔ ÎÁÐÉÓÁÎÎÙÊ ÎÁ ÑÚÙËÅ C.
+Summary(ru):	Eggdrop, ÜÔÏ IRC-ÂÏÔ ÎÁÐÉÓÁÎÎÙÊ ÎÁ ÑÚÙËÅ C.
 Name:		eggdrop
-Version:	1.6.13
-Release:	4
-License:	GPL
+Version:	1.6.17
+Release:	1
+License:	GPL v2
 Group:		Applications/Communications
-Source0:	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.gz
-# PLD docs - information about changes.
-Source1:	http://pld.mysza.eu.org/sources/%{name}-README.PLD.en
-Source2:	http://pld.mysza.eu.org/sources/%{name}-README.PLD.pl
+Source0:	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.bz2
+# Source0-md5:	68e181201483dee398f9904e8652e6ca
 # 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:	%{name}-language-danish.tar.gz
-Source11:	%{name}-language-finnish.tar.gz
-Source12:	%{name}-language-italian.tar.gz
-Source13:	%{name}-language-norwegian.tar.gz
-Source14:	%{name}-language-portuguese.tar.gz
-Source15:	%{name}-language-portuguese_br.tar.gz
-Source16:	%{name}-language-romanian.tar.gz
+Source10:	http://pld.mysza.eu.org/sources/%{name}-language-danish.tar.gz
+# Source10-md5:	86b9bbab196f64b09e4daf2dec93fd50
+Source11:	http://pld.mysza.eu.org/sources/%{name}-language-finnish.tar.gz
+# Source11-md5:	d720c6ad3f19deb8d51eeb753d0da390
+Source12:	http://pld.mysza.eu.org/sources/%{name}-language-italian.tar.gz
+# Source12-md5:	9c568bc516ecb202ed9e76c1523e4d6a
+Source13:	http://pld.mysza.eu.org/sources/%{name}-language-norwegian.tar.gz
+# Source13-md5:	118e14c8dfe0a6917e8e7b191a733e3f
+Source14:	http://pld.mysza.eu.org/sources/%{name}-language-portuguese.tar.gz
+# Source14-md5:	1b96f1ba51a0162665be892327c405cf
+Source15:	http://pld.mysza.eu.org/sources/%{name}-language-portuguese_br.tar.gz
+# Source15-md5:	93d4afae51dfa4cd7512fa6236868960
+Source16:	http://pld.mysza.eu.org/sources/%{name}-language-romanian.tar.gz
+# Source16-md5:	3664b4f4870eb099d3a291284a076561
 # Additional modules taken from various places
-Source20:	%{name}-module-away-1.0.tar.gz
-Source21:	%{name}-module-botnetop-1.0.1.tar.gz
-Source22:	%{name}-module-fakebotnet-1.3.tar.gz
-Source23:	%{name}-module-gseen-1.1.0.tar.gz
-Source24:	%{name}-module-irctree-1.1.tar.gz
-Source25:	%{name}-module-megahal-2.5.tar.gz
-Source26:	%{name}-module-stats-1.3.3dev1.tar.gz
-Source27:	%{name}-module-idea-1.0.0.tar.gz
-Source28:	%{name}-module-twofish-1.0.tar.gz
-Source29:	%{name}-module-rijndael-1.0.tar.gz
+Source20:	http://pld.mysza.eu.org/sources/%{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-md5:	1815a88748529d2ce6a221d560678285
+Source22:	http://pld.mysza.eu.org/sources/%{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-md5:	d1b5ff929c360581647a2baf7281a7a6
+Source24:	http://pld.mysza.eu.org/sources/%{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-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-md5:	dce4a43dfcfb72e143c71e8f6c6fc8c8
+Source28:	http://pld.mysza.eu.org/sources/%{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
 Patch0:		%{name}-FHS.patch
-# Unofficial IPv6 patch
-Patch1:		http://www.egghelp.org/files/patches/%{name}%{version}+ipv6.patch.gz
-# Adds IPv6 variables to config file
-Patch2:		%{name}%{version}+ipv6_config.patch
-# Adds additional docs
-Patch3:		%{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
-Patch4:		%{name}%{version}-multilevel_sharing.patch.gz
-# Unlinkedby patch - when unlinking bot from botnet, adds nickname of a person
-# that issues .unlink command to a broadcasted message
-Patch5:		%{name}%{version}-unlinkedby.patch
-# Topicprot - protects channel topic from being changed
-# This patch was a bit modified to apply to eggdrop1.6.13
-Patch6:		%{name}%{version}-topicprot.patch
-# Adds information about additional encryption modules to config file
-Patch7:		%{name}-config_encryption.patch
-# This one fixes eggdrop botchk/autobotchk scripts
-Patch8:		%{name}%{version}-autobotchk.patch
+Patch1:		%{name}-doc_makefile.patch
+Patch2:		%{name}-multilevel_sharing.patch
+Patch3:		%{name}-topicprot.patch
+Patch4:		%{name}-config_encryption.patch
+Patch5:		%{name}-autobotchk.patch
+Patch6:		%{name}-ssl.patch
+Patch7:		%{name}-amd64.patch
+Patch8:		%{name}-nolibs.patch
+Patch9:		%{name}-nohostwhowhom.patch
 URL:		http://www.eggheads.org/
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	tcl-devel
 Requires:	tcl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -67,7 +74,6 @@ recognize banished users or sites and reject them, to recognize
 privileged users and let them gain ops, etc. Eggdrop also contains
 many modules and scripts, for example for sending files. Here is the
 list of new features as opposed to vanilla eggdrop:
-- Built-in IPv6 support
 - Additional modules, including:
   - away
   - botnetop
@@ -85,8 +91,8 @@ list of new features as opposed to vanilla eggdrop:
   - portuguese
   - brazillian portuguese
   - romanian
-- Various small patches were applied 
-For more information, see README.PLD.en file located under 
+- Various small patches were applied
+For more information, see README.PLD.en file located under
 %{_docdir}/%{name}-%{version}
 
 %description -l pl
@@ -96,7 +102,6 @@ nadawaniem odpowiednich przywilej
 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:
-- Wbudowane wsparcie dla IPv6
 - Dodatkowe modu³y, takie jak:
   - away
   - botnetop
@@ -114,8 +119,8 @@ Oto lista nowych mo
   - portugalski
   - brazylijska odmiana portugalskiego
   - rumuñski
-- Zaaplikowano rózne mniejsze lub wiêksze ³aty 
-Wiêcej informacji znajdziesz w pliku README.PLD.pl znajduj±cym siê 
+- 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
@@ -127,7 +132,7 @@ poss
 reconhecendo usuários privilegiados e permitindo que estes recebam OPS
 etc.
 
-%description -l ru_RU.KOI8-R
+%description -l ru.KOI8-R
 Eggdrop, ÜÔÏ IRC-ÂÏÔ ÎÁÐÉÓÁÎÎÙÊ ÎÁ ÑÚÙËÅ C. åÓÌÉ ×Ù ÎÅ ÚÎÁÅÔÅ,
 ÞÔÏ ÔÁËÏÅ IRC, ÔÏ ÜÔÏ ×ÅÒÏÑÔÎÏ ÎÅ ÔÏ, ÞÔÏ ×Ù ÉÝÅÔÅ!
 Eggdrop ÎÁÈÏÄÉÔÓÑ ÎÁ ËÁÎÁÌÅ × ÃÅÌÑÈ ÏËÁÚÁÎÉÑ ÚÁÝÉÔÎÙÈ ÍÅÒ:
@@ -140,67 +145,56 @@ Eggdrop 
 %prep
 %setup -q -n %{name}%{version} -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29
 %patch0 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
+%patch1 -p0
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p0
+%patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
-CFLAGS="%{rpmcflags}"; export CFLAGS
-# There is no sense in using configure macro, as the eggdrop makes no use
-# of provided settings, or at least of those given with --*dir options
-./configure
+mv aclocal.m4 acinclude.m4
+cp -f /usr/share/automake/config.sub misc/
+%{__aclocal}
+%{__autoheader}
+%{__autoconf}
+cd src/mod/compress.mod
+%{__autoconf}
+%configure
+cd ../dns.mod
+%{__autoconf}
+%configure
+cd ../../..
+%configure
 %{__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} DESTDIR="$RPM_BUILD_ROOT" install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 mv $RPM_BUILD_ROOT/%{name}-%{version} $RPM_BUILD_ROOT%{_bindir}/%{name}
+mv -f $RPM_BUILD_ROOT{/{text/*,help,scripts,language},%{_datadir}/%{name}/}
+mv -f $RPM_BUILD_ROOT/modules/* $RPM_BUILD_ROOT%{_libdir}/%{name}/modules/
+mv -f $RPM_BUILD_ROOT{/doc,%{_mandir}}/man1/%{name}.1 
+rm -rf $RPM_BUILD_ROOT/{doc,README,logs,eggdrop.conf}
 
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.PLD.en
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.PLD.pl
-
-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 %{_datadir}/doc/%{name}-%{version}
+%doc docs/*
 %attr(755,root,root) %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/modules