Merge branch 'master' into f18

Conflicts:
	znc-infobot.spec

znc-infobot.spec

@@ -1,7 +1,7 @@
 Summary:        infobot module for ZNC IRC Bouncer
 Name:           znc-infobot
-Version:        1.0
-Release:        2%{?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,19 @@ 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 <fedora@matbooth.co.uk> - 1.2-1
+- Rebuild for znc 1.2
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Wed Nov 28 2012 Tom Callaway <spot@fedoraproject.org> - 1.0-2
 - it lives!