Merge branch 'master' into el5

.gitignore

@@ -22,3 +22,5 @@
 /znc-0.204.tar.gz
 /znc-0.206.tar.gz
 /znc-1.0-alpha1.tar.gz
+/znc-1.0-beta1.tar.gz
+/znc-1.0.tar.gz

sources

@@ -1 +1 @@
-c2287115826d2e226ae60f437de69833  znc-1.0-alpha1.tar.gz
+23807ca830c27392cccb6774f542df6e  znc-1.0.tar.gz

znc.spec

@@ -11,11 +11,12 @@ Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        1.0
 #Release:        0.1.20110801git%{?dist}
-Release:        0.1.alpha1%{?dist}
+#Release:        0.2.beta1%{?dist}
+Release:        1%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.in
-Source0:        http://znc.in/releases/znc-1.0-alpha1.tar.gz
+Source0:        http://znc.in/releases/znc-1.0.tar.gz
 
 %if %{use_systemd}
 Source1:        znc.service
@@ -81,8 +82,8 @@ Requires:      tcl
 TCL module for ZNC
 
 %prep
-#%setup -q -n %{name}-%{version}
-%setup -q -n znc-1.0-alpha1
+%setup -q -n %{name}-%{version}
+#%setup -q -n znc-1.0-beta1
 #%patch0 -p1
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
@@ -243,6 +244,12 @@ fi
 %{_libdir}/znc/modtcl.so
 
 %changelog
+* Tue Nov 13 2012 Nick Bebout <nb@fedoraproject.org> - 1.0-1
+- Update to 1.0
+
+* Thu Oct 18 2012 Nick Bebout <nb@fedoraproject.org> - 1.0-0.2.beta1
+- Update to 1.0-beta1
+
 * Thu Sep 13 2012 Nick Bebout <nb@fedoraproject.org> - 1.0-0.1.alpha1
 - Update to 1.0-alpha1