- release 2 (by relup.sh)

[packages/eggdrop.git] / eggdrop.spec

diff --git a/eggdrop.spec b/eggdrop.spec
index f16a77d66e23137ebc681a8348db6d8bee41053f..30e171e5347270254e8d01ddc977cc0b1ae58dfc 100644 (file)
--- a/eggdrop.spec
+++ b/eggdrop.spec
@@ -1,15 +1,19 @@
-%bcond_with    suzi # encoding enhancements
+#
+# Conditional build:
+%bcond_with    suzi    # encoding enhancements
+%bcond_without ssl             # openssl patch
+#
 Summary:       Eggdrop is an IRC bot, written in 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.19
-Release:       4
+Version:       1.6.21
+Release:       2
 License:       GPL v2
 Group:         Applications/Communications
 Source0:       ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.bz2
-# Source0-md5: b706bbe4fdd05964e0ea0cd920f28539
+# Source0-md5: 5663b2daecc790e6e9237e1d5a2caa50
 # 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/
@@ -48,21 +52,30 @@ Source28:   %{name}-module-twofish-1.0.tar.gz
 # Source28-md5:        861957c170b4af105199202e724be2a3
 #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/eggdrop1.6.19-patch-sp0009.tar.bz2
-# Source30-md5:        a9c610c95a13d3dc54809173d8a75c34
+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
 Patch2:                %{name}-multilevel_sharing.patch
+# http://www.egghelp.org/files.htm#patches
 Patch3:                %{name}-topicprot.patch
 Patch4:                %{name}-config_encryption.patch
 Patch5:                %{name}-autobotchk.patch
+# http://www.egghelp.org/files.htm#patches
 Patch6:                %{name}-ssl.patch
 Patch7:                %{name}-nolibs.patch
 Patch8:                %{name}-nohostwhowhom.patch
+Patch9:                %{name}-nmu.patch
+Patch10:       %{name}-ipv6-ssl.patch
+Patch11:       ssl-md5.patch
+Patch12:       %{name}-build.patch
+Patch13:       x32.patch
 URL:           http://www.eggheads.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: openssl-devel >= 0.9.7d
+%{?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)
@@ -146,8 +159,10 @@ Eggdrop находится на канале в целях оказания за
 
 %prep
 %setup -q -n %{name}%{version} -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a30
+%{?with_ssl:%patch6 -p0}
+mv aclocal.m4 acinclude.m4
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -158,14 +173,21 @@ Eggdrop находится на канале в целях оказания за
 patch -p1 < eggdrop1.6.19-sp.0009.diff || exit 1
 %else
 %patch2 -p1
-%patch6 -p1
 %endif
 
-%build
+#%patch9 -p0 - wtf is this?
+#%{?with_ssl:%patch10 -p1}
+%if "%{pld_release}" == "ac"
+%patch11 -p1
+%endif
+
+%patch12 -p1
+%patch13 -p1
+
 # detect threaded tcl version
-sed -i -e 's#TclpFinalizeThreadData#Tcl_FinalizeThread#g' aclocal.m4
+sed -i -e 's#TclpFinalizeThreadData#Tcl_FinalizeThread#g' acinclude.m4
 
-mv aclocal.m4 acinclude.m4
+%build
 cp -f /usr/share/automake/config.sub misc/
 cp -f %{name}.conf doc/%{name}.conf.example
 %{__aclocal}
@@ -179,7 +201,8 @@ cd ../dns.mod
 %configure
 cd ../../..
 %configure \
-       --enable-tcl-threads
+       --enable-tcl-threads \
+       --enable-ipv6
 %{__make} config
 %{__make}
 
@@ -188,13 +211,15 @@ rm -rf $RPM_BUILD_ROOT
 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 -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
+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}
 
 rm -rf docs
 cp -a doc docs