Merge branch 'el6/master' of ssh://pkgs.fedoraproject.org/znc into el6

Conflicts:
	.gitignore
	sources
	znc.spec

znc.spec

@@ -3,7 +3,7 @@ Name:           znc
 Version:        0.097
 Release:        7.svn2277%{?dist}
 #Release:        0.1.rc1%{?dist}
-#Release:        2%{?dist}
+Release:        2%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
@@ -14,7 +14,7 @@ Source0:        znc-0.097.svn2277.tar.xz
 # tar Jcvf znc-0.097.svn2272.tar.xz znc-0.097.svn2272/
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  perl gcc-c++ automake
+BuildRequires:  perl gcc-c++
 BuildRequires:  openssl-devel >= 0.9.8
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  c-ares-devel
@@ -68,7 +68,6 @@ perl module for ZNC
 chmod -x modules/q.cpp
 
 %build
-./autogen.sh
 %configure \
      --with-module-prefix=%{_libdir}/znc \
      --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl