Merge branch 'master' into el6

Conflicts:
	sources
	znc.spec

.gitignore

@@ -9,3 +9,4 @@ znc-0.094.tar.gz
 /znc-0.097.svn2269.tar.bz2
 /znc-0.097.svn2272.tar.xz
 /znc-0.097.svn2277.tar.xz
+/znc-0.097.tar.xz

sources

@@ -1 +1 @@
-70c06d4f5f6d0bc70dc35a3477e5c15b  znc-0.097.svn2277.tar.xz
+ef4368c196707c6cd93ef8591332bb30  znc-0.097.tar.xz

znc.spec

@@ -1,17 +1,17 @@
 Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.097
-Release:        7.svn2277%{?dist}
+Release:        8.20110215git%{?dist}
 #Release:        0.1.rc1%{?dist}
 Release:        2%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
-URL:            http://znc.sf.net/
+URL:            http://znc.in
 #Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source0:        znc-0.097.svn2277.tar.xz
-# svn export -r 2272 https://znc.svn.sourceforge.net/svnroot/znc/trunk
-# mv trunk znc-0.097.svn2272
-# tar Jcvf znc-0.097.svn2272.tar.xz znc-0.097.svn2272/
+Source0:        znc-0.097.tar.xz
+# git clone https://github.com/znc/znc.git
+# cd znc
+# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl gcc-c++
@@ -63,7 +63,7 @@ perl module for ZNC
 
 %prep
 #%setup -q
-%setup -q -n znc-0.097.svn2277
+%setup -q -n %{name}
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -82,7 +82,7 @@ chmod -x modules/q.cpp
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS LICENSE LICENSE.OpenSSL README
+%doc AUTHORS LICENSE LICENSE.OpenSSL README.md
 %{_bindir}/znc
 %{_mandir}/man1/*
 %{_libdir}/znc/admin.so
@@ -161,7 +161,10 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/modperl.so
 
 %changelog
-* Fri Feb 11 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-7.svn2277
+* Tue Feb 15 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-8.20110215git
+- Update to latest git
+
+* Wed Feb 09 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-7.svn2277
 - Update to svn2277
 
 * Mon Jan 24 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-6.svn2272