[znc/el6/master: 2/2] Merge branch 'el6/master' of ssh://pkgs.fedoraproject.org/znc into el6

[Nick Bebout]

commit 7a3ea1108ec5de6d5fb52aa028c0815071dd18b4
Merge: 5db4107 eda4c45
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Feb 11 20:27:15 2011 -0600

    Merge branch 'el6/master' of ssh://pkgs.fedoraproject.org/znc into el6
    
    Conflicts:
    	.gitignore
    	sources
    	znc.spec

 znc.spec |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --cc znc.spec
index 297da18,6efab90..1fcba13
--- a/znc.spec
+++ b/znc.spec
@@@ -1,20 -1,21 +1,20 @@@
  Summary:        An advanced IRC bouncer
  Name:           znc
 -Version:        0.096
 -#Release:        2.svn2101%{?dist}
 +Version:        0.097
 +Release:        7.svn2277%{?dist}
  #Release:        0.1.rc1%{?dist}
- #Release:        2%{?dist}
+ Release:        2%{?dist}
  License:        GPLv2 with exceptions
  Group:          System Environment/Daemons
  URL:            http://znc.sf.net/
 -Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 -#Source0:        znc-0.093.svn2101.tar.bz2
 -# svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk
 -# mv trunk znc-0.093.svn2101
 -# tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/
 -#Patch0:         znc-trafficstats.patch
 +#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/
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
- BuildRequires:  perl gcc-c++ automake
+ BuildRequires:  perl gcc-c++
  BuildRequires:  openssl-devel >= 0.9.8
  BuildRequires:  cyrus-sasl-devel
  BuildRequires:  c-ares-devel