Merge branch 'master' into f16

Conflicts:
	.gitignore
	sources
	znc-infobot.spec

.gitignore

@@ -1 +1 @@
-/znc-infobot-0.200.tar.gz
+/znc-infobot-0.202.tar.gz

sources

@@ -1 +1 @@
-5623a93fcc3a1a61c39244a9294e1426  znc-infobot-0.200.tar.gz
+80cadcba6988e66110406ad3f519c777  znc-infobot-0.202.tar.gz

znc-infobot.spec

@@ -1,18 +1,20 @@
 Summary:        infobot module for ZNC IRC Bouncer
 Name:           znc-infobot
-Version:        0.200
+Version:        0.202
 Release:        1%{?dist}
 License:        GPLv2
 Group:          System Environment/Daemons
 URL:            http://znc-msvc.googlecode.com
-Source0:        znc-infobot-0.200.tar.gz
+Source0:        znc-infobot-0.202.tar.gz
 # Had to generate tar.gz manually download source file : http://znc-msvc.googlecode.com/svn/trunk/flakes/infobot.cpp
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  znc znc-devel openssl-devel
-BuildRequires:  c-ares c-ares-devel pcre-devel
+BuildRequires:  znc = znc-%{version}
+BuildRequires:  znc-devel = znc-devel-%{version}
+BuildRequires:  c-ares c-ares-devel pcre-devel openssl-devel
 
-Requires: znc pcre
+Requires: znc = znc-%{version}
+Requires: pcre
 
 %description
 This is a user module for ZNC that provides joined 
@@ -36,6 +38,10 @@ mv infobot.so %{buildroot}%{_libdir}/znc/
 %{_libdir}/znc/infobot.so
 
 %changelog
+* Tue Oct 18 2011 Nick Bebout <nb@fedoraproject.org> - 0.202-1
+- ZNC is at 0.202 now
+- Require same version of ZNC as module
+
 * Sun Sep 25 2011 Keiran "Affix" Smith <affix@fedoraproject.org> - 0.200-1
 - Initial Package of 0.200