Merge branch 'master' into f15

Conflicts:
	.gitignore
	sources
	znc-infobot.spec

.gitignore

@@ -0,0 +1,2 @@
+/znc-infobot-0.202.tar.gz
+/znc-infobot-0.204.tar.gz

dead.package

@@ -1 +0,0 @@
-2014-08-19: Dead upstream since 2011 with unfixed bugs: https://fedorahosted.org/rel-eng/ticket/5968

sources

@@ -0,0 +1 @@
+80cadcba6988e66110406ad3f519c777  znc-infobot-0.204.tar.gz

znc-infobot.spec

@@ -0,0 +1,56 @@
+Summary:        infobot module for ZNC IRC Bouncer
+Name:           znc-infobot
+Version:        0.206
+Release:        1%{?dist}
+License:        GPLv2
+Group:          System Environment/Daemons
+URL:            http://znc-msvc.googlecode.com
+Source0:        znc-infobot-0.204.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 = %{version}
+BuildRequires:  znc-devel = %{version}
+BuildRequires:  c-ares c-ares-devel pcre-devel openssl-devel
+
+Requires: znc = %{version}
+Requires: pcre
+
+%description
+This is a user module for ZNC that provides joined 
+channels with a multitude of bot commands
+
+%prep
+%setup -q -n %{name}-0.202
+
+%build
+LIBS="-lpcrecpp -lpcre" znc-buildmod infobot.cpp
+
+%install
+mkdir -p %{buildroot}%{_libdir}/znc/
+mv infobot.so %{buildroot}%{_libdir}/znc/
+
+%clean
+%__rm -Rf "%{buildroot}"
+
+%files
+%defattr(-,root,root)
+%{_libdir}/znc/infobot.so
+
+%changelog
+* Sat Apr 21 2012 Nick Bebout <nb@fedoraproject.org> - 0.206-1
+- Rebuild for znc 0.206
+
+* Thu Feb 9 2012 Nick Bebout <nb@fedoraproject.org> - 0.204-1
+- Rebuild for znc 0.204
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.202-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* 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
+