Merge branch 'master' into el5

.gitignore

@@ -11,3 +11,4 @@ znc-0.094.tar.gz
 /znc-0.097.svn2277.tar.xz
 /znc-0.097.tar.xz
 /znc-0.098-alpha1.tar.gz
+/znc-0.098-beta.tar.gz

sources

@@ -1 +1 @@
-88b3bf579bdceb763bc7d863049cccf2  znc-0.098-alpha1.tar.gz
+ee2d1bc0a1d02521d37ab71728eeee31  znc-0.098-beta.tar.gz

znc-release.patch

@@ -0,0 +1,11 @@
+--- znc-0.098-beta-original/znc.cpp	2011-03-02 07:45:07.000000000 -0600
++++ znc-0.098-beta/znc.cpp	2011-03-03 16:48:07.752119484 -0600
+@@ -96,7 +96,7 @@
+ 	}
+ 
+ 	char szBuf[128];
+-	snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f"VERSION_EXTRA" - http://znc.in", VERSION);
++	snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f - http://znc.in", VERSION);
+ 	// If snprintf overflows (which I doubt), we want to be on the safe side
+ 	szBuf[sizeof(szBuf) - 1] = '\0';
+ 

znc.spec

@@ -2,14 +2,15 @@ Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.098
 #Release:        8.20110215git%{?dist}
-Release:        0.1.alpha1%{?dist}
+Release:        0.2.beta%{?dist}
 #Release:        2%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.in
 #Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 #Source0:        znc-0.097.tar.xz
-Source0:        http://people.znc.in/~psychon/znc/releases/znc-0.098-alpha1.tar.gz
+Source0:        http://people.znc.in/~psychon/znc/releases/znc-0.098-beta.tar.gz
+Patch0:         znc-release.patch
 # git clone https://github.com/znc/znc.git
 # cd znc
 # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz
@@ -55,7 +56,8 @@ TCL module for ZNC
 
 %prep
 #%setup -q
-%setup -q -n %{name}-%{version}-alpha1
+%setup -q -n %{name}-%{version}-beta
+%patch0 -p1
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -148,6 +150,9 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/modtcl.so
 
 %changelog
+* Wed Mar 02 2011 Nick Bebout <nb@fedoraproject.org> - 0.098-0.2.beta
+- Update to znc-0.098-beta
+
 * Wed Feb 23 2011 Nick Bebout <nb@fedoraproject.org> - 0.098-0.1.alpha1
 - Update to znc 0.098-alpha1