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

[Nick Bebout]

commit 67bf6ba54ba70e5b9bcdffde8b7fe0ecd1aad7c5
Merge: 7d1112e bfb86d8
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Mar 3 17:29:14 2011 -0600

    Merge branch 'master' into el6

 .gitignore        |    1 +
 sources           |    2 +-
 znc-release.patch |   11 +++++++++++
 znc.spec          |   11 ++++++++---
 4 files changed, 21 insertions(+), 4 deletions(-)
---
diff --cc znc.spec
index 3fc672e,31cfd49..0117b1c
--- a/znc.spec
+++ b/znc.spec
@@@ -62,9 -63,19 +63,10 @@@ 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}-%{version}-alpha1
+ %setup -q -n %{name}-%{version}-beta
+ %patch0 -p1
  %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
  chmod -x modules/q.cpp
  
@@@ -163,7 -175,15 +165,10 @@@
  %{_libdir}/znc/modperl.so
  %{_libdir}/znc/perleval.pm
  
 -%files modpython
 -%defattr(-,root,root)
 -%{_libdir}/znc/modpython/
 -%{_libdir}/znc/modpython.so
 -
  %changelog
+ * Wed Mar 02 2011 Nick Bebout <nb at fedoraproject.org> - 0.098-0.2.beta
+ - Update to znc-0.098-beta
+ 
  * Wed Feb 23 2011 Nick Bebout <nb at fedoraproject.org> - 0.098-0.1.alpha1
  - Update to znc 0.098-alpha1