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

[Nick Bebout]

commit b236362c57417bc523cac767fa32d810af8b5fe5
Merge: d4ce3a6 a451907
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Sep 26 18:11:16 2013 -0500

    Merge branch 'master' into el6

 .gitignore |    1 +
 sources    |    2 +-
 znc.spec   |   15 +++++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --cc znc.spec
index 0927717,bf78d2a..d9b457a
--- a/znc.spec
+++ b/znc.spec
@@@ -91,9 -91,18 +91,9 @@@ Provides:      perl(ZNC::Module) = %{ve
  %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}
- %setup -q -n znc-1.2-alpha1
+ %setup -q -n znc-1.2-beta1
  #%patch0 -p1
  %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
  chmod -x modules/q.cpp
@@@ -260,7 -270,18 +261,13 @@@ f
  %{_libdir}/znc/modperl.so
  %{_libdir}/znc/perleval.pm
  
 -%files modpython
 -%defattr(-,root,root)
 -%{_libdir}/znc/modpython/
 -%{_libdir}/znc/modpython.so
 -
  %changelog
+ * Thu Sep 26 2013 Nick Bebout <nb at fedoraproject.org> - 1.2-0.3.beta1
+ - Upgrade to 1.2-beta1
+ 
+ * Sat Aug 03 2013 Petr Pisar <ppisar at redhat.com> - 1.2-0.2.alpha1
+ - Perl 5.18 rebuild
+ 
  * Sun Jul 28 2013 Nick Bebout <nb at fedoraproject.org> - 1.2-0.1.alpha1
  - Upgrade to 1.2-alpha1