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

[Nick Bebout]

commit 57f28eeb8264f8f4845a45d2de54ab5473322969
Merge: 80badf2 5ab3382
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Apr 1 23:10:20 2011 +0000

    Merge branch 'master' into el5

 .gitignore |    1 +
 sources    |    2 +-
 znc.spec   |   18 +++++++++++-------
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --cc znc.spec
index 46cf652,38cf4cb..744ea96
--- a/znc.spec
+++ b/znc.spec
@@@ -54,10 -55,28 +55,10 @@@ 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}-rc1
- %patch0 -p1
+ %setup -q
+ #%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 -170,21 +150,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
+ * Tue Mar 29 2011 Nick Bebout <nb at fedoraproject.org> - 0.098-1
+ - Update to znc-0.098
+ 
  * Sat Mar 12 2011 Nick Bebout <nb at fedoraproject.org> - 0.098-0.3.rc1
  - Update to znc-0.098-rc1