Merge branch 'master' of ssh://pkgs.fedoraproject.org/znc
Conflicts: znc.spec
This commit is contained in:
commit
e6732194ce
13
znc.spec
13
znc.spec
@ -1,7 +1,7 @@
|
||||
Summary: An advanced IRC bouncer
|
||||
Name: znc
|
||||
Version: 0.097
|
||||
Release: 2.svn2255%{?dist}
|
||||
Release: 4.svn2255%{?dist}
|
||||
#Release: 0.1.rc1%{?dist}
|
||||
#Release: 2%{?dist}
|
||||
License: GPLv2 with exceptions
|
||||
@ -178,8 +178,15 @@ chmod -x modules/q.cpp
|
||||
%{_libdir}/znc/modpython.so
|
||||
|
||||
%changelog
|
||||
* Fri Dec 24 2010 Nick Bebout <nb@fedoraproject.org> - 0.097-2.svn2255
|
||||
- Patch has been upstreamed, update to svn2255
|
||||
<<<<<<< HEAD
|
||||
* 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
|
||||
|
||||
* Wed Dec 22 2010 Nick Bebout <nb@fedoraproject.org> - 0.097-1.svn2213
|
||||
- Update to znc 0.097-svn2213 which also adds modpython
|
||||
|
Loading…
Reference in New Issue
Block a user