Merge branch 'master' into el5
Conflicts: .gitignore
This commit is contained in:
commit
5fd9362b70
4
.gitignore
vendored
4
.gitignore
vendored
@ -1 +1,5 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
znc-0.093.svn2101.tar.bz2
|
znc-0.093.svn2101.tar.bz2
|
||||||
|
=======
|
||||||
|
znc-0.094.tar.gz
|
||||||
|
>>>>>>> master
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
c3a67b46669774cf02c31156f03c4643 znc-0.093.svn2101.tar.bz2
|
db101f7a7756285d824b59e3b33e3ad5 znc-0.094.tar.gz
|
||||||
|
15
znc.spec
15
znc.spec
@ -1,14 +1,14 @@
|
|||||||
Summary: An advanced IRC bouncer
|
Summary: An advanced IRC bouncer
|
||||||
Name: znc
|
Name: znc
|
||||||
Version: 0.093
|
Version: 0.094
|
||||||
Release: 2.svn2101%{?dist}
|
#Release: 2.svn2101%{?dist}
|
||||||
#Release: 0.1.rc1%{?dist}
|
#Release: 0.1.rc1%{?dist}
|
||||||
#Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2 with exceptions
|
License: GPLv2 with exceptions
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
URL: http://znc.sf.net/
|
URL: http://znc.sf.net/
|
||||||
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||||
Source0: znc-0.093.svn2101.tar.bz2
|
#Source0: znc-0.093.svn2101.tar.bz2
|
||||||
# svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk
|
# svn export -r 2101 https://znc.svn.sourceforge.net/svnroot/znc/trunk
|
||||||
# mv trunk znc-0.093.svn2101
|
# mv trunk znc-0.093.svn2101
|
||||||
# tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/
|
# tar jcvf znc-0.093.svn2101.tar.bz2 znc-0.093.svn2101/
|
||||||
@ -45,7 +45,7 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
Extra modules for ZNC
|
Extra modules for ZNC
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n znc-0.093.svn2101
|
%setup -q
|
||||||
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
|
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
|
||||||
chmod -x modules/q.cpp
|
chmod -x modules/q.cpp
|
||||||
|
|
||||||
@ -135,6 +135,9 @@ chmod -x modules/q.cpp
|
|||||||
%{_libdir}/znc/shell.so
|
%{_libdir}/znc/shell.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 10 2010 Nick Bebout <nb@fedoraproject.org> - 0.094-1
|
||||||
|
- Update to znc 0.094
|
||||||
|
|
||||||
* Tue Aug 10 2010 Nick Bebout <nb@fedoraproject.org> - 0.093-2.svn2101
|
* Tue Aug 10 2010 Nick Bebout <nb@fedoraproject.org> - 0.093-2.svn2101
|
||||||
- Update to znc 0.093.svn2101 to fix CVE-2010-2812 and CVE-2010-2934
|
- Update to znc 0.093.svn2101 to fix CVE-2010-2812 and CVE-2010-2934
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user