[znc/el4: 49/49] Merge branch 'el5' into el4

[Nick Bebout]

commit 64f93bf9598bab38c3d3086bcc04f717ea13f9d9
Merge: 0cf1f7b 0fe0897
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Aug 23 19:02:07 2011 -0500

    Merge branch 'el5' into el4
    
    Conflicts:
    	znc.spec

 .gitignore          |    6 ++-
 sources             |    2 +-
 znc-modperl.patch   |   11 +++++
 znc-modpython.patch |   11 +++++
 znc-release.patch   |    6 +-
 znc.init            |   90 ++++++++++++++++++++++++++++++++++++++++
 znc.service         |   11 +++++
 znc.spec            |  115 ++++++++++++++++++++++++++++++++++++++++++++++-----
 8 files changed, 236 insertions(+), 16 deletions(-)
---
diff --cc znc.spec
index 54002f3,8e234f8..9ff4157
--- a/znc.spec
+++ b/znc.spec
@@@ -86,17 -142,19 +142,19 @@@ f
  %{_libdir}/znc/autocycle.so
  %{_libdir}/znc/autoop.so
  %{_libdir}/znc/autoreply.so
 -%{_libdir}/znc/away.so
 +#%{_libdir}/znc/away.so
  %{_libdir}/znc/awaynick.so
  %{_libdir}/znc/blockuser.so
+ %{_libdir}/znc/bouncedcc.so
  %{_libdir}/znc/buffextras.so
 -%{_libdir}/znc/cert.so
 -%{_libdir}/znc/certauth.so
++#%{_libdir}/znc/cert.so
 +#%{_libdir}/znc/certauth.so
  %{_libdir}/znc/chansaver.so
  %{_libdir}/znc/clientnotify.so
 -%{_libdir}/znc/crypt.so
 +#%{_libdir}/znc/crypt.so
  %{_libdir}/znc/disconkick.so
  %{_libdir}/znc/fail2ban.so
- %{_libdir}/znc/fixfreenode.so
+ %{_libdir}/znc/identfile.so
  %{_libdir}/znc/keepnick.so
  %{_libdir}/znc/kickrejoin.so
  %{_libdir}/znc/lastseen.so