rpms
/
znc
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into el6 

Conflicts:
	.gitignore
This commit is contained in:
Nick Bebout 2010-09-24 20:31:36 -04:00
parent 1ceb799b22 428c95dbda
commit cf240a3186
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
znc-0.093.svn2101.tar.bz2 znc-0.094.tar.gz

2
sources
View File

@ -1 +1 @@
c3a67b46669774cf02c31156f03c4643 znc-0.093.svn2101.tar.bz2 db101f7a7756285d824b59e3b33e3ad5 znc-0.094.tar.gz

15
znc.spec
View File

@ -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