[znc-infobot] fix compile against znc 1.0

[Tom Callaway]

commit d7ccc14e2d267e690cbf86f84ada078cb86b37da
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Nov 28 11:19:20 2012 -0500

    fix compile against znc 1.0

 znc-infobot-1.0-znc1.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 znc-infobot.spec           |    9 +++++++--
 2 files changed, 51 insertions(+), 2 deletions(-)
---
diff --git a/znc-infobot-1.0-znc1.patch b/znc-infobot-1.0-znc1.patch
new file mode 100644
index 0000000..0db13a7
--- /dev/null
+++ b/znc-infobot-1.0-znc1.patch
@@ -0,0 +1,44 @@
+diff -up znc-infobot-0.202/infobot.cpp.znc1 znc-infobot-0.202/infobot.cpp
+--- znc-infobot-0.202/infobot.cpp.znc1	2012-11-28 10:48:03.703592940 -0500
++++ znc-infobot-0.202/infobot.cpp	2012-11-28 11:06:55.221609919 -0500
+@@ -14,6 +14,7 @@
+ #include "znc.h"
+ #include "Chan.h"
+ #include "Modules.h"
++#include "IRCNetwork.h"
+ #include "User.h"
+ 
+ #include <pcre.h>
+@@ -25,9 +26,9 @@
+ 
+ using namespace pcrecpp;
+ 
+-typedef map<const CString, VCString> TEnabledChanMap;
+-typedef map<const CString, bool> TColorsEnabledMap;
+-typedef map<const CString, char> TTriggerCharMap;
++typedef std::map<const CString, VCString> TEnabledChanMap;
++typedef std::map<const CString, bool> TColorsEnabledMap;
++typedef std::map<const CString, char> TTriggerCharMap;
+ 
+ class CInfoBotModule : public CModule
+ {
+@@ -1203,8 +1204,8 @@ void CInfoBotModule::SendMessage(const C
+ 		sText.Replace("%CLO%", "");
+ 	}
+ 
+-	m_pUser->PutIRC("PRIVMSG " + sSendTo + " :" + sText);
+-	m_pUser->PutUser(":" + m_pUser->GetIRCNick().GetNickMask() + " PRIVMSG " + sSendTo + " :" + sText);
++	m_pNetwork->PutIRC("PRIVMSG " + sSendTo + " :" + sText);
++	m_pNetwork->PutUser(":" + m_pNetwork->GetIRCNick().GetNickMask() + " PRIVMSG " + sSendTo + " :" + sText);
+ }
+ 
+ void CInfoBotModule::OnModCommand(const CString& sCommand)
+@@ -1484,7 +1485,7 @@ CInfoBotModule::EModRet CInfoBotModule::
+ {
+ 	if(!sTarget.empty() && !isalnum(sTarget[0]))
+ 	{
+-		CheckLineForTrigger(sMessage, sTarget.AsLower(), m_pUser->GetIRCNick().GetNick());
++		CheckLineForTrigger(sMessage, sTarget.AsLower(), m_pNetwork->GetIRCNick().GetNick());
+ 	}
+ 	return CONTINUE;
+ }
diff --git a/znc-infobot.spec b/znc-infobot.spec
index 1f6c73d..bfb427c 100644
--- a/znc-infobot.spec
+++ b/znc-infobot.spec
@@ -1,12 +1,13 @@
 Summary:        infobot module for ZNC IRC Bouncer
 Name:           znc-infobot
 Version:        1.0
-Release:        1%{?dist}
+Release:        2%{?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
+Patch0:		znc-infobot-1.0-znc1.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  znc = %{version}
@@ -22,9 +23,10 @@ channels with a multitude of bot commands
 
 %prep
 %setup -q -n %{name}-0.202
+%patch0 -p1 -b .znc1
 
 %build
-LIBS="-lpcrecpp -lpcre" znc-buildmod infobot.cpp
+LIBS="-lpcrecpp -lpcre" INCLUDES="-I/usr/include/znc" znc-buildmod infobot.cpp
 
 %install
 mkdir -p %{buildroot}%{_libdir}/znc/
@@ -38,6 +40,9 @@ mv infobot.so %{buildroot}%{_libdir}/znc/
 %{_libdir}/znc/infobot.so
 
 %changelog
+* Wed Nov 28 2012 Tom Callaway <spot at fedoraproject.org> - 1.0-2
+- it lives!
+
 * Tue Nov 13 2012 Nick Bebout <nb at fedoraproject.org> - 1.0-1
 - Rebuild for znc 1.0