From 3d02c054d5fcf481babfb096d81902833f4b96fa Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 13 Nov 2012 17:46:54 -0600 Subject: [PATCH 1/5] Rebuild for znc 1.0 --- znc-infobot.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/znc-infobot.spec b/znc-infobot.spec index 37f1105..1f6c73d 100644 --- a/znc-infobot.spec +++ b/znc-infobot.spec @@ -1,7 +1,7 @@ Summary: infobot module for ZNC IRC Bouncer Name: znc-infobot -Version: 0.206 -Release: 2%{?dist} +Version: 1.0 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://znc-msvc.googlecode.com @@ -38,6 +38,9 @@ mv infobot.so %{buildroot}%{_libdir}/znc/ %{_libdir}/znc/infobot.so %changelog +* Tue Nov 13 2012 Nick Bebout - 1.0-1 +- Rebuild for znc 1.0 + * Sun Jul 22 2012 Fedora Release Engineering - 0.206-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From d7ccc14e2d267e690cbf86f84ada078cb86b37da Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 28 Nov 2012 11:19:20 -0500 Subject: [PATCH 2/5] fix compile against znc 1.0 --- znc-infobot-1.0-znc1.patch | 44 ++++++++++++++++++++++++++++++++++++++ znc-infobot.spec | 9 ++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 znc-infobot-1.0-znc1.patch 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 +@@ -25,9 +26,9 @@ + + using namespace pcrecpp; + +-typedef map TEnabledChanMap; +-typedef map TColorsEnabledMap; +-typedef map TTriggerCharMap; ++typedef std::map TEnabledChanMap; ++typedef std::map TColorsEnabledMap; ++typedef std::map 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 - 1.0-2 +- it lives! + * Tue Nov 13 2012 Nick Bebout - 1.0-1 - Rebuild for znc 1.0 From 2ec00888946590266d454b17e4db08e0d28b8c27 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:23:54 -0600 Subject: [PATCH 3/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- znc-infobot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc-infobot.spec b/znc-infobot.spec index bfb427c..bca287e 100644 --- a/znc-infobot.spec +++ b/znc-infobot.spec @@ -1,7 +1,7 @@ Summary: infobot module for ZNC IRC Bouncer Name: znc-infobot Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://znc-msvc.googlecode.com @@ -40,6 +40,9 @@ mv infobot.so %{buildroot}%{_libdir}/znc/ %{_libdir}/znc/infobot.so %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Nov 28 2012 Tom Callaway - 1.0-2 - it lives! From 416cc73e6e210d3e54d24b0fc13fb6d06c67c2a1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:58:36 -0500 Subject: [PATCH 4/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- znc-infobot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc-infobot.spec b/znc-infobot.spec index bca287e..63941df 100644 --- a/znc-infobot.spec +++ b/znc-infobot.spec @@ -1,7 +1,7 @@ Summary: infobot module for ZNC IRC Bouncer Name: znc-infobot Version: 1.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://znc-msvc.googlecode.com @@ -40,6 +40,9 @@ mv infobot.so %{buildroot}%{_libdir}/znc/ %{_libdir}/znc/infobot.so %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From f86d7b57ea30b54a815fbd3719f5b4bc91f10c04 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 26 Aug 2013 21:23:37 +0100 Subject: [PATCH 5/5] Rebuild for znc 1.2 --- znc-infobot.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/znc-infobot.spec b/znc-infobot.spec index 63941df..47cc449 100644 --- a/znc-infobot.spec +++ b/znc-infobot.spec @@ -1,7 +1,7 @@ Summary: infobot module for ZNC IRC Bouncer Name: znc-infobot -Version: 1.0 -Release: 4%{?dist} +Version: 1.2 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://znc-msvc.googlecode.com @@ -9,7 +9,6 @@ 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} BuildRequires: znc-devel = %{version} BuildRequires: c-ares c-ares-devel pcre-devel openssl-devel @@ -32,14 +31,13 @@ LIBS="-lpcrecpp -lpcre" INCLUDES="-I/usr/include/znc" znc-buildmod infobot.cpp mkdir -p %{buildroot}%{_libdir}/znc/ mv infobot.so %{buildroot}%{_libdir}/znc/ -%clean -%__rm -Rf "%{buildroot}" - %files -%defattr(-,root,root) %{_libdir}/znc/infobot.so %changelog +* Mon Aug 26 2013 Mat Booth - 1.2-1 +- Rebuild for znc 1.2 + * Sun Aug 04 2013 Fedora Release Engineering - 1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild