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

[Nick Bebout]

commit 0fe089738fffeae86bdd1d086eda44a446396073
Merge: 20ca258 5709cc8
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Aug 23 18:32:18 2011 -0500

    Merge branch 'master' into el5

 .gitignore |    2 +-
 sources    |    2 +-
 znc.spec   |   14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --cc znc.spec
index b9b548b,e5fdc96..8e234f8
--- a/znc.spec
+++ b/znc.spec
@@@ -74,9 -71,28 +71,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
 -Provides:      perl(ZNC::Module) = %{version}-%{release}
 -
 -%description modperl
 -perl module for ZNC
 -
 -%package modpython
 -Summary:       python3 module for ZNC
 -Group:         Development/Libraries
 -Requires:      %{name} = %{version}-%{release}
 -Requires:      python3
 -
 -%description modpython
 -python3 module for ZNC
 -
  %prep
- %setup -q -n %{name}-%{version}-rc1
- %patch0 -p1
+ %setup -q -n %{name}-%{version}
+ #%patch0 -p1
  %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
  chmod -x modules/q.cpp
  
@@@ -215,7 -232,21 +212,10 @@@ f
  %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 Aug 23 2011 Nick Bebout <nb at fedoraproject.org> - 0.200-1
+ - Update to 0.200
+ 
  * Mon Aug 15 2011 Nick Bebout <nb at fedoraproject.org> - 0.200-0.5.rc1
  - Don't create the znc user on Fedora 14 and lower and on EPEL