[znc/el6: 4/5] Merge branch 'master' into el6

[Nick Bebout]

commit 4542ab64075084faebbaba64f8ef8ee59118827e
Merge: 0087478 de0b54b
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Aug 6 20:13:34 2011 -0500

    Merge branch 'master' into el6

 .gitignore          |    3 +++
 sources             |    2 +-
 znc-modperl.patch   |   11 +++++++++++
 znc-modpython.patch |   11 +++++++++++
 znc-release.patch   |    8 ++++----
 znc.spec            |   40 ++++++++++++++++++++++++++++------------
 6 files changed, 58 insertions(+), 17 deletions(-)
---
diff --cc znc.spec
index fcf4674,0ba2037..aa6fe53
--- a/znc.spec
+++ b/znc.spec
@@@ -65,10 -66,22 +66,13 @@@ Provides:      perl(ZNC::Module) = %{ve
  %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}-alpha1
+ %setup -q -n znc-0.2-beta1
  #%setup -q -n %{name}-%{version}-rc1
- #%patch0 -p1
+ %patch0 -p1
+ #%patch1 -p1
+ #%patch2 -p1
  %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
  chmod -x modules/q.cpp
  
@@@ -167,7 -184,21 +174,16 @@@
  %{_libdir}/znc/modperl.so
  %{_libdir}/znc/perleval.pm
  
 -%files modpython
 -%defattr(-,root,root)
 -%{_libdir}/znc/modpython/
 -%{_libdir}/znc/modpython.so
 -
  %changelog
+ * Sat Aug 6 2011 Nick Bebout <nb at fedoraproject.org> - 0.2-0.2.beta1
+ - Update to 0.2-beta1
+ 
+ * Fri Aug 5 2011 Nick Bebout <nb at fedoraproject.org> - 0.2-0.1.alpha1
+ - Update to 0.2-alpha1
+ 
+ * Mon Aug 1 2011 Nick Bebout <nb at fedoraproject.org> - 0.099-0.1.20110801git
+ - Update to latest git
+ 
  * Sat Apr 2 2011 Nick Bebout <nb at fedoraproject.org> - 0.098-2
  - Add provides for ZNC::Module to znc-modperl