Merge branch 'master' into el5

This commit is contained in:
Nick Bebout 2011-04-01 23:10:20 +00:00
commit 57f28eeb82
3 changed files with 13 additions and 8 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ znc-0.094.tar.gz
/znc-0.098-alpha1.tar.gz
/znc-0.098-beta.tar.gz
/znc-0.098-rc1.tar.gz
/znc-0.098.tar.gz

View File

@ -1 +1 @@
4ed07ff97ff33b76c5396d4416e96d1c znc-0.098-rc1.tar.gz
5667b4acb1f01309d6eded77abac700c znc-0.098.tar.gz

View File

@ -2,15 +2,16 @@ Summary: An advanced IRC bouncer
Name: znc
Version: 0.098
#Release: 8.20110215git%{?dist}
Release: 0.3.rc1%{?dist}
#Release: 2%{?dist}
#Release: 0.3.rc1%{?dist}
Release: 1%{?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-rc1.tar.gz
Patch0: znc-release.patch
#Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-rc1.tar.gz
Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098.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,9 +56,9 @@ Requires: tcl
TCL module for ZNC
%prep
#%setup -q
%setup -q -n %{name}-%{version}-rc1
%patch0 -p1
%setup -q
#%setup -q -n %{name}-%{version}-rc1
#%patch0 -p1
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
chmod -x modules/q.cpp
@ -150,6 +151,9 @@ chmod -x modules/q.cpp
%{_libdir}/znc/modtcl.so
%changelog
* Tue Mar 29 2011 Nick Bebout <nb@fedoraproject.org> - 0.098-1
- Update to znc-0.098
* Sat Mar 12 2011 Nick Bebout <nb@fedoraproject.org> - 0.098-0.3.rc1
- Update to znc-0.098-rc1