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

[Nick Bebout]

commit a715998d180be8ebb0c29dd58c463e875e4945e4
Merge: 43c2ae2 8edc3f1
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Thu Sep 13 20:17:30 2012 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	znc.spec

 .gitignore |    1 +
 sources    |    2 +-
 znc.spec   |   71 +++++++++++++++++++++++++++---------------------------------
 3 files changed, 34 insertions(+), 40 deletions(-)
---
diff --cc znc.spec
index dc44145,ca77d20..aa8eaa6
--- a/znc.spec
+++ b/znc.spec
@@@ -33,8 -33,10 +33,10 @@@ BuildRoot:      %{_tmppath}/%{name}-%{v
  BuildRequires:  perl gcc-c++
  BuildRequires:  openssl-devel >= 0.9.8
  BuildRequires:  cyrus-sasl-devel
 -BuildRequires:  c-ares-devel automake python3-devel
 +BuildRequires:  c-ares-devel automake
  BuildRequires:  perl(ExtUtils::Embed) swig tcl-devel
+ Obsoletes:      znc-extra <= %{version}-%{release}
+ 
  %if %{use_systemd}
  BuildRequires: systemd-units
  %endif
@@@ -96,8 -90,18 +90,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 %{name}-%{version}
+ %setup -q -n znc-1.0-alpha1
  #%patch0 -p1
  %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
  chmod -x modules/q.cpp
@@@ -272,7 -268,18 +259,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 13 2012 Nick Bebout <nb at fedoraproject.org> - 1.0-0.1.alpha1
+ - Update to 1.0-alpha1
+ 
+ * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.206-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Mon Apr 16 2012 Nick Bebout <nb at fedoraproject.org> - 0.206-1
  - Upgrade to 0.206