[znc/el4/master: 142/142] Merge branch 'el5' into el4

[Nick Bebout]

commit cdbf747c97549aba6d9696fe1f83c382a77a5f6e
Merge: 3715725 80badf2
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Mar 25 22:00:27 2011 -0500

    Merge branch 'el5' into el4
    
    Conflicts:
    	.gitignore
    	sources
    	znc.spec

 .gitignore        |   16 +++++++-
 sources           |    2 +-
 znc-release.patch |   11 +++++
 znc.spec          |  111 +++++++++++++++++++++++++++++++++++++++++++---------
 4 files changed, 118 insertions(+), 22 deletions(-)
---
diff --cc znc.spec
index 5482783,46cf652..b4699f1
--- a/znc.spec
+++ b/znc.spec
@@@ -1,20 -1,26 +1,26 @@@
  Summary:        An advanced IRC bouncer
  Name:           znc
- Version:        0.090
- #Release:        0.1.rc1%{?dist}
- Release:        2%{?dist}
+ Version:        0.098
+ #Release:        8.20110215git%{?dist}
+ Release:        0.3.rc1%{?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
- Patch0:         znc-trafficstats.patch
+ 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-rc1.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
  
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
- BuildRequires:  perl gcc-c++
- BuildRequires:  openssl-devel >= 0.9.8
+ BuildRequires:  gcc-c++ perl
 -BuildRequires:  openssl-devel >= 0.9.8
++#BuildRequires:  openssl-devel >= 0.9.8
  BuildRequires:  cyrus-sasl-devel
- BuildRequires:  c-ares-devel
- BuildRequires:  perl(ExtUtils::Embed)
+ BuildRequires:  c-ares-devel automake
+ BuildRequires:  tcl-devel
  
  %description
  ZNC is an IRC bouncer with many advanced features like detaching,
@@@ -47,8 -63,8 +63,8 @@@ chmod -x modules/q.cp
  
  %build
  %configure \
--     --with-module-prefix=%{_libdir}/znc \
-      --enable-ipv6 --enable-extra --enable-sasl
++     --with-module-prefix=%{_libdir}/znc --disable-ssl \
+      --enable-ipv6 --enable-extra --enable-sasl --disable-perl --enable-tcl
  %__make %{?_smp_mflags}
  
  %install
@@@ -69,13 -85,14 +85,14 @@@
  %{_libdir}/znc/autocycle.so
  %{_libdir}/znc/autoop.so
  %{_libdir}/znc/autoreply.so
--%{_libdir}/znc/away.so
++#%{_libdir}/znc/away.so
  %{_libdir}/znc/awaynick.so
  %{_libdir}/znc/blockuser.so
  %{_libdir}/znc/buffextras.so
 -%{_libdir}/znc/certauth.so
++#%{_libdir}/znc/certauth.so
  %{_libdir}/znc/chansaver.so
  %{_libdir}/znc/clientnotify.so
--%{_libdir}/znc/crypt.so
++#%{_libdir}/znc/crypt.so
  %{_libdir}/znc/disconkick.so
  %{_libdir}/znc/fail2ban.so
  %{_libdir}/znc/fixfreenode.so
@@@ -92,8 -107,8 +107,8 @@@
  %{_libdir}/znc/raw.so
  %{_libdir}/znc/route_replies.so
  %{_libdir}/znc/sample.so
--%{_libdir}/znc/savebuff.so
--%{_libdir}/znc/schat.so
++#%{_libdir}/znc/savebuff.so
++#%{_libdir}/znc/schat.so
  %{_libdir}/znc/send_raw.so
  %{_libdir}/znc/shell.so
  %{_libdir}/znc/simple_away.so