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

[Nick Bebout]

commit 80badf29e8d60c08b723e3cb135bee6b15e0bdaf
Merge: 17fac95 a52b503
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Mar 12 13:43:34 2011 -0600

    Merge branch 'master' into el5

 .gitignore |    1 +
 sources    |    2 +-
 znc.spec   |    9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc znc.spec
index 6037c93,adc68fe..46cf652
--- a/znc.spec
+++ b/znc.spec
@@@ -54,9 -54,27 +54,9 @@@ Requires:      tc
  %description modtcl
  TCL module for ZNC
  
 -%package modperl
 -Summary:       perl module for ZNC
 -Group:         Development/Libraries
 -Requires:      %{name} = %{version}-%{release}
 -Requires:      perl
 -
 -%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
@@@ -149,7 -169,21 +149,10 @@@
  %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
+ * 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