Merge branch 'master' into el6

This commit is contained in:
Nick Bebout 2011-01-24 11:27:14 -06:00
commit 20087f7dc0
3 changed files with 24 additions and 8 deletions

3
.gitignore vendored
View File

@ -5,3 +5,6 @@ znc-0.094.tar.gz
/znc-0.097.svn2202.tar.bz2
/znc-0.097.svn2213.tar.bz2
/znc-0.097.svn2214.tar.bz2
/znc-0.097.svn2255.tar.bz2
/znc-0.097.svn2269.tar.bz2
/znc-0.097.svn2272.tar.xz

View File

@ -1 +1 @@
a61e6fd9bac0a9cbbd17d352dab7b70c znc-0.097.svn2214.tar.bz2
efc94ac63e6d4e4682a5978f3996da9e znc-0.097.svn2272.tar.xz

View File

@ -1,20 +1,20 @@
Summary: An advanced IRC bouncer
Name: znc
Version: 0.097
Release: 2.svn2214%{?dist}
Release: 6.svn2272%{?dist}
#Release: 0.1.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
Source0: znc-0.097.svn2214.tar.bz2
# svn export -r 2214 https://znc.svn.sourceforge.net/svnroot/znc/trunk
# mv trunk znc-0.097.svn2214
# tar jcvf znc-0.097.svn2214.tar.bz2 znc-0.097.svn2214/
Source0: znc-0.097.svn2272.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++
BuildRequires: perl gcc-c++ automake
BuildRequires: openssl-devel >= 0.9.8
BuildRequires: cyrus-sasl-devel
BuildRequires: c-ares-devel python3-devel
@ -73,11 +73,12 @@ python module for ZNC
%prep
#%setup -q
%setup -q -n znc-0.097.svn2214
%setup -q -n znc-0.097.svn2272
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
chmod -x modules/q.cpp
%build
./autogen.sh
%configure \
--with-module-prefix=%{_libdir}/znc \
--enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \
@ -177,6 +178,18 @@ chmod -x modules/q.cpp
%{_libdir}/znc/modpython.so
%changelog
* Mon Jan 24 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-6.svn2272
- Update to svn2272
* Mon Jan 17 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-5.svn2269
- Update to svn2269
* Fri Jan 7 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-4.svn2255
- Update to svn2255
* Mon Jan 3 2011 David Malcolm <dmalcolm@redhat.com> - 0.097-3.svn2214
- rebuild for newer python3 (see rhbz#666429)
* Fri Dec 24 2010 Nick Bebout <nb@fedoraproject.org> - 0.097-2.svn2214
- Patch has been upstreamed, update to svn2214