packages: eggdrop/eggdrop.spec - topicprot and ssl patches updated from egg...

[glen]

Author: glen                         Date: Sat Mar 31 16:45:47 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- topicprot and ssl patches updated from egghelp.org

---- Files affected:
packages/eggdrop:
   eggdrop.spec (1.121 -> 1.122) 

---- Diffs:

================================================================
Index: packages/eggdrop/eggdrop.spec
diff -u packages/eggdrop/eggdrop.spec:1.121 packages/eggdrop/eggdrop.spec:1.122
--- packages/eggdrop/eggdrop.spec:1.121	Sat Mar 31 14:21:33 2012
+++ packages/eggdrop/eggdrop.spec	Sat Mar 31 18:45:42 2012
@@ -10,7 +10,7 @@
 Summary(ru.UTF-8):	Eggdrop, это IRC-бот написанный на языке C.
 Name:		eggdrop
 Version:	1.6.21
-Release:	0.3
+Release:	0.6
 License:	GPL v2
 Group:		Applications/Communications
 Source0:	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.bz2
@@ -58,9 +58,11 @@
 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
@@ -153,6 +155,7 @@
 
 %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 -p1
@@ -166,11 +169,10 @@
 patch -p1 < eggdrop1.6.19-sp.0009.diff || exit 1
 %else
 %patch2 -p1
-%{?with_ssl:%patch6 -p1}
 %endif
 
 #%patch9 -p0 - wtf is this?
-%{?with_ssl:%patch10 -p1}
+#%{?with_ssl:%patch10 -p1}
 
 # detect threaded tcl version
 sed -i -e 's#TclpFinalizeThreadData#Tcl_FinalizeThread#g' acinclude.m4
@@ -232,6 +234,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.122  2012/03/31 16:45:42  glen
+- topicprot and ssl patches updated from egghelp.org
+
 Revision 1.121  2012/03/31 12:21:33  glen
 - up to 1.6.21
   add ssl bcond
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/eggdrop/eggdrop.spec?r1=1.121&r2=1.122