Merge branch 'master' into el5
This commit is contained in:
commit
0fe089738f
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,4 +1,3 @@
|
||||
znc-0.094.tar.gz
|
||||
/znc-0.096.tar.gz
|
||||
/znc-0.097.svn2196.tar.bz2
|
||||
/znc-0.097.svn2197.tar.bz2
|
||||
@ -18,3 +17,4 @@ znc-0.094.tar.gz
|
||||
/znc-0.2-alpha1.tar.gz
|
||||
/znc-0.2-beta1.tar.gz
|
||||
/znc-0.200-rc1.tar.gz
|
||||
/znc-0.200.tar.gz
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
40b99830fac3f5ee813d3ab04b4b9e74 znc-0.200-rc1.tar.gz
|
||||
da5b690bc31b007474a77aae70c9c049 znc-0.200.tar.gz
|
||||
|
14
znc.spec
14
znc.spec
@ -9,18 +9,15 @@ Summary: An advanced IRC bouncer
|
||||
Name: znc
|
||||
Version: 0.200
|
||||
#Release: 0.1.20110801git%{?dist}
|
||||
Release: 0.5.rc1%{?dist}
|
||||
Release: 1%{?dist}
|
||||
#Release: 1%{?dist}
|
||||
License: GPLv2 with exceptions
|
||||
Group: System Environment/Daemons
|
||||
URL: http://znc.in
|
||||
#Source0: znc-0.099.tar.xz
|
||||
Source0: http://people.znc.in/~psychon/znc/releases/znc-0.200-rc1.tar.gz
|
||||
Source0: http://znc.in/releases/znc-0.200.tar.gz
|
||||
%if %{use_systemd}
|
||||
Source1: znc.service
|
||||
%endif
|
||||
#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
|
||||
@ -75,8 +72,8 @@ Requires: tcl
|
||||
TCL module for ZNC
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}-rc1
|
||||
%patch0 -p1
|
||||
%setup -q -n %{name}-%{version}
|
||||
#%patch0 -p1
|
||||
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
|
||||
chmod -x modules/q.cpp
|
||||
|
||||
@ -216,6 +213,9 @@ fi
|
||||
%{_libdir}/znc/modtcl.so
|
||||
|
||||
%changelog
|
||||
* Tue Aug 23 2011 Nick Bebout <nb@fedoraproject.org> - 0.200-1
|
||||
- Update to 0.200
|
||||
|
||||
* Mon Aug 15 2011 Nick Bebout <nb@fedoraproject.org> - 0.200-0.5.rc1
|
||||
- Don't create the znc user on Fedora 14 and lower and on EPEL
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user