Merge branch 'master' into el6

.gitignore

@@ -27,3 +27,4 @@
 /znc-1.2-alpha1.tar.gz
 /znc-1.2-beta1.tar.gz
 /znc-1.2-rc2.tar.gz
+/znc-1.2.tar.gz

sources

@@ -1 +1 @@
-38eb9496b74cabcd1d6dbc585ef872e8  znc-1.2-rc2.tar.gz
+ef18e5402a82cc3fcab5c2ac5c2e6f3b  znc-1.2.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.4.rc2%{?dist}
-#Release:        3%{?dist}
+#Release:        0.4.rc2%{?dist}
+Release:        1%{?dist}
 License:        ASL 2.0
 Group:          System Environment/Daemons
 URL:            http://znc.in
-Source0:        http://znc.in/releases/znc-1.2-rc2.tar.gz
+Source0:        http://znc.in/releases/znc-1.2.tar.gz
 
 %if %{use_systemd}
 Source1:        znc.service
@@ -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.2-rc2
+%setup -q -n %{name}-%{version}
+#%setup -q -n znc-1.2-rc2
 #%patch0 -p1
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
@@ -262,6 +262,9 @@ fi
 %{_libdir}/znc/perleval.pm
 
 %changelog
+* Mon Nov 11 2013 Nick Bebout <nb@fedoraproject.org> - 1.2-1
+- Upgrade to 1.2
+
 * Fri Oct 25 2013 Nick Bebout <nb@fedoraproject.org> - 1.2-0.4.rc2
 - Upgrade to 1.2-rc2