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

[Nick Bebout]

commit d4996dc85b31166269f232d672f57c29703d26ed
Merge: 67bf6ba a52b503
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Mar 12 13:40:00 2011 -0600

    Merge branch 'master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 znc.spec   |    9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc znc.spec
index 0117b1c,adc68fe..41704b0
--- a/znc.spec
+++ b/znc.spec
@@@ -63,9 -63,18 +63,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}-%{version}-beta
+ %setup -q -n %{name}-%{version}-rc1
  %patch0 -p1
  %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
  chmod -x modules/q.cpp
@@@ -165,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
+ * Sat Mar 12 2011 Nick Bebout <nb at fedoraproject.org> - 0.098-0.3.rc1
+ - Update to znc-0.098-rc1
+ 
  * Wed Mar 02 2011 Nick Bebout <nb at fedoraproject.org> - 0.098-0.2.beta
  - Update to znc-0.098-beta