[znc/el5: 3/3] Merge branch 'master' into el5

[Nick Bebout]

commit 5b3d8c498258559a4812441ebacfe2ae4e81cb71
Merge: 1c303f6 97507d9
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Jan 23 15:13:43 2012 -0600

    Merge branch 'master' into el5

 znc.init |    2 +-
 znc.spec |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 5 deletions(-)
---
diff --cc znc.spec
index 039aaab,44f68fb..e1c9ecd
--- a/znc.spec
+++ b/znc.spec
@@@ -214,7 -275,21 +255,10 @@@ f
  %defattr(-,root,root)
  %{_libdir}/znc/modtcl.so
  
 -%files modperl
 -%defattr(-,root,root)
 -%{_libdir}/znc/modperl/
 -%{_libdir}/znc/modperl.so
 -%{_libdir}/znc/perleval.pm
 -
 -%files modpython
 -%defattr(-,root,root)
 -%{_libdir}/znc/modpython/
 -%{_libdir}/znc/modpython.so
 -
  %changelog
+ * Mon Jan 23 2012 Nick Bebout <nb at fedoraproject.org> - 0.204-2
+ - Add init script for EPEL
+ 
  * Mon Jan 23 2012 Nick Bebout <nb at fedoraproject.org> - 0.204-1
  - Update to 0.204 to fix security issue CVE-2012-0033