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

[Nick Bebout]

commit 7d1112e53c6da8d57d6642d8d1c081dca348ae5d
Merge: 3a7df48 0a5ad7b
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Feb 24 19:55:48 2011 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	znc.spec

 .gitignore                        |    1 +
 sources                           |    2 +-
 znc-0.097.svn2213-modpython.patch |   23 -----------------------
 znc.spec                          |   15 ++++++++++-----
 4 files changed, 12 insertions(+), 29 deletions(-)
---
diff --cc znc.spec
index 595dc34,51d98ae..3fc672e
--- a/znc.spec
+++ b/znc.spec
@@@ -61,9 -62,18 +62,9 @@@ Requires:      per
  %description modperl
  perl module for ZNC
  
 -%package modpython
 -Summary:       python module for ZNC
 -Group:         Development/Libraries
 -Requires:      %{name} = %{version}-%{release}
 -Requires:      python3
 -
 -%description modpython
 -python module for ZNC
 -
  %prep
  #%setup -q
- %setup -q -n %{name}
+ %setup -q -n %{name}-%{version}-alpha1
  %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
  chmod -x modules/q.cpp
  
@@@ -160,8 -171,17 +161,12 @@@
  %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
+ * Wed Feb 23 2011 Nick Bebout <nb at fedoraproject.org> - 0.098-0.1.alpha1
+ - Update to znc 0.098-alpha1
+ 
  * Tue Feb 15 2011 Nick Bebout <nb at fedoraproject.org> - 0.097-8.20110215git
  - Update to latest git