Merge branch 'master' into el6

Conflicts:
	znc.spec

.gitignore

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

sources

@@ -1 +1 @@
-23807ca830c27392cccb6774f542df6e  znc-1.0.tar.gz
+4ed75f8a9d2685ec823db42983dc54fe  znc-1.2-alpha1.tar.gz

znc.spec

@@ -9,14 +9,14 @@
 
 Summary:        An advanced IRC bouncer
 Name:           znc
-Version:        1.0
+Version:        1.2
 #Release:        0.1.20110801git%{?dist}
-#Release:        0.2.beta1%{?dist}
-Release:        1%{?dist}
-License:        GPLv2 with exceptions
+Release:        0.1.alpha1%{?dist}
+#Release:        3%{?dist}
+License:        ASL 2.0
 Group:          System Environment/Daemons
 URL:            http://znc.in
-Source0:        http://znc.in/releases/znc-1.0.tar.gz
+Source0:        http://znc.in/releases/znc-1.2-alpha1.tar.gz
 
 %if %{use_systemd}
 Source1:        znc.service
@@ -33,7 +33,7 @@ Source1:        znc.init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl gcc-c++
 BuildRequires:  openssl-devel >= 0.9.8
-BuildRequires:  cyrus-sasl-devel
+BuildRequires:  cyrus-sasl-devel gettext-devel
 BuildRequires:  c-ares-devel automake
 BuildRequires:  perl(ExtUtils::Embed) swig tcl-devel
 Obsoletes:      znc-extra <= %{version}-%{release}
@@ -92,8 +92,8 @@ Provides:      perl(ZNC::Module) = %{version}-%{release}
 perl module for ZNC
 
 %prep
-%setup -q -n %{name}-%{version}
-#%setup -q -n znc-1.0-beta1
+#%setup -q -n %{name}-%{version}
+%setup -q -n znc-1.2-alpha1
 #%patch0 -p1
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
@@ -180,7 +180,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS LICENSE LICENSE.OpenSSL README.md
+%doc AUTHORS LICENSE README.md
 %{_bindir}/znc
 %{_mandir}/man1/*
 %{_libdir}/znc/adminlog.so
@@ -261,6 +261,15 @@ fi
 %{_libdir}/znc/perleval.pm
 
 %changelog
+* Sun Jul 28 2013 Nick Bebout <nb@fedoraproject.org> - 1.2-0.1.alpha1
+- Upgrade to 1.2-alpha1
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1.0-3
+- Perl 5.18 rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Tue Nov 13 2012 Nick Bebout <nb@fedoraproject.org> - 1.0-1
 - Update to 1.0