Merge branch 'master' into el6

.gitignore

@@ -25,3 +25,4 @@
 /znc-1.0-beta1.tar.gz
 /znc-1.0.tar.gz
 /znc-1.2-alpha1.tar.gz
+/znc-1.2-beta1.tar.gz

sources

@@ -1 +1 @@
-4ed75f8a9d2685ec823db42983dc54fe  znc-1.2-alpha1.tar.gz
+26c5135fb1e6380f960020b66166f758  znc-1.2-beta1.tar.gz

znc.spec

@@ -11,12 +11,12 @@ Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        1.2
 #Release:        0.1.20110801git%{?dist}
-Release:        0.1.alpha1%{?dist}
+Release:        0.3.beta1%{?dist}
 #Release:        3%{?dist}
 License:        ASL 2.0
 Group:          System Environment/Daemons
 URL:            http://znc.in
-Source0:        http://znc.in/releases/znc-1.2-alpha1.tar.gz
+Source0:        http://znc.in/releases/znc-1.2-beta1.tar.gz
 
 %if %{use_systemd}
 Source1:        znc.service
@@ -28,7 +28,7 @@ Source1:        znc.init
 
 # git clone https://github.com/znc/znc.git
 # cd znc
-# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz
+# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl gcc-c++
@@ -93,7 +93,7 @@ perl module for ZNC
 
 %prep
 #%setup -q -n %{name}-%{version}
-%setup -q -n znc-1.2-alpha1
+%setup -q -n znc-1.2-beta1
 #%patch0 -p1
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
@@ -217,6 +217,7 @@ fi
 %{_libdir}/znc/listsockets.so
 %{_libdir}/znc/log.so
 %{_libdir}/znc/missingmotd.so
+%{_libdir}/znc/modules_online.so
 %{_libdir}/znc/nickserv.so
 %{_libdir}/znc/notes.so
 %{_libdir}/znc/notify_connect.so
@@ -261,6 +262,12 @@ fi
 %{_libdir}/znc/perleval.pm
 
 %changelog
+* Thu Sep 26 2013 Nick Bebout <nb@fedoraproject.org> - 1.2-0.3.beta1
+- Upgrade to 1.2-beta1
+
+* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 1.2-0.2.alpha1
+- Perl 5.18 rebuild
+
 * Sun Jul 28 2013 Nick Bebout <nb@fedoraproject.org> - 1.2-0.1.alpha1
 - Upgrade to 1.2-alpha1