packages: eggdrop/eggdrop.spec - openssl conflict not occouring in th

[glen]

Author: glen                         Date: Sat Mar 31 19:37:11 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- openssl conflict not occouring in th

---- Files affected:
packages/eggdrop:
   eggdrop.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: packages/eggdrop/eggdrop.spec
diff -u packages/eggdrop/eggdrop.spec:1.123 packages/eggdrop/eggdrop.spec:1.124
--- packages/eggdrop/eggdrop.spec:1.123	Sat Mar 31 20:56:10 2012
+++ packages/eggdrop/eggdrop.spec	Sat Mar 31 21:37:06 2012
@@ -53,7 +53,7 @@
 # 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:	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
@@ -73,6 +73,8 @@
 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)
@@ -174,7 +176,9 @@
 
 #%patch9 -p0 - wtf is this?
 #%{?with_ssl:%patch10 -p1}
+%if "%{pld_release}" == "ac"
 %patch11 -p1
+%endif
 
 # detect threaded tcl version
 sed -i -e 's#TclpFinalizeThreadData#Tcl_FinalizeThread#g' acinclude.m4
@@ -236,6 +240,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2012/03/31 19:37:06  glen
+- openssl conflict not occouring in th
+
 Revision 1.123  2012/03/31 18:56:10  glen
 - use md5 from openssl
 
================================================================

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