Merge branch 'master' into el6
This commit is contained in:
commit
1880cbb260
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@ znc-0.094.tar.gz
|
|||||||
/znc-0.097.svn2255.tar.bz2
|
/znc-0.097.svn2255.tar.bz2
|
||||||
/znc-0.097.svn2269.tar.bz2
|
/znc-0.097.svn2269.tar.bz2
|
||||||
/znc-0.097.svn2272.tar.xz
|
/znc-0.097.svn2272.tar.xz
|
||||||
|
/znc-0.097.svn2277.tar.xz
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
efc94ac63e6d4e4682a5978f3996da9e znc-0.097.svn2272.tar.xz
|
9a1ee24e4d38c5adabb761fa586c3830 znc-0.097.svn2277.tar.xz
|
||||||
|
15
znc.spec
15
znc.spec
@ -1,17 +1,17 @@
|
|||||||
Summary: An advanced IRC bouncer
|
Summary: An advanced IRC bouncer
|
||||||
Name: znc
|
Name: znc
|
||||||
Version: 0.097
|
Version: 0.097
|
||||||
Release: 6.svn2272%{?dist}
|
Release: 7.svn2277%{?dist}
|
||||||
#Release: 0.1.rc1%{?dist}
|
#Release: 0.1.rc1%{?dist}
|
||||||
#Release: 2%{?dist}
|
#Release: 2%{?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.097.svn2272.tar.xz
|
Source0: znc-0.097.svn2277.tar.xz
|
||||||
# svn export -r 2272 https://znc.svn.sourceforge.net/svnroot/znc/trunk
|
# svn export -r 2277 https://znc.svn.sourceforge.net/svnroot/znc/trunk
|
||||||
# mv trunk znc-0.097.svn2272
|
# mv trunk znc-0.097.svn2277
|
||||||
# tar Jcvf znc-0.097.svn2272.tar.xz znc-0.097.svn2272/
|
# tar Jcvf znc-0.097.svn2277.tar.xz znc-0.097.svn2277/
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
BuildRequires: perl gcc-c++ automake
|
BuildRequires: perl gcc-c++ automake
|
||||||
@ -73,7 +73,7 @@ python module for ZNC
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
#%setup -q
|
#%setup -q
|
||||||
%setup -q -n znc-0.097.svn2272
|
%setup -q -n znc-0.097.svn2277
|
||||||
%__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
|
||||||
|
|
||||||
@ -178,6 +178,9 @@ chmod -x modules/q.cpp
|
|||||||
%{_libdir}/znc/modpython.so
|
%{_libdir}/znc/modpython.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 09 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-7.svn2277
|
||||||
|
- Update to svn2277
|
||||||
|
|
||||||
* Mon Jan 24 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-6.svn2272
|
* Mon Jan 24 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-6.svn2272
|
||||||
- Update to svn2272
|
- Update to svn2272
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user