Merge branch 'el6' into el5

znc.spec

@@ -17,7 +17,7 @@ Source0:        http://people.znc.in/~psychon/znc/releases/znc-0.098-alpha1.tar.
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl gcc-c++
 BuildRequires:  openssl-devel >= 0.9.8
-BuildRequires:  cyrus-sasl-devel python3-devel
+BuildRequires:  cyrus-sasl-devel
 BuildRequires:  c-ares-devel automake
 BuildRequires:  perl(ExtUtils::Embed) swig tcl-devel
 
@@ -62,15 +62,6 @@ 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}-alpha1
@@ -81,8 +72,7 @@ chmod -x modules/q.cpp
 ./autogen.sh
 %configure \
      --with-module-prefix=%{_libdir}/znc \
-     --enable-ipv6 --enable-extra --enable-sasl --enable-perl \
-     --enable-tcl --enable-python
+     --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl
 %__make %{?_smp_mflags}
 
 %install
@@ -173,11 +163,6 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/modperl.so
 %{_libdir}/znc/perleval.pm
 
-%files modpython
-%defattr(-,root,root)
-%{_libdir}/znc/modpython/
-%{_libdir}/znc/modpython.so
-
 %changelog
 * Wed Feb 23 2011 Nick Bebout <nb@fedoraproject.org> - 0.098-0.1.alpha1
 - Update to znc 0.098-alpha1