Merge branch 'master' into el6
This commit is contained in:
commit
67bf6ba54b
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@ znc-0.094.tar.gz
|
|||||||
/znc-0.097.svn2277.tar.xz
|
/znc-0.097.svn2277.tar.xz
|
||||||
/znc-0.097.tar.xz
|
/znc-0.097.tar.xz
|
||||||
/znc-0.098-alpha1.tar.gz
|
/znc-0.098-alpha1.tar.gz
|
||||||
|
/znc-0.098-beta.tar.gz
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
88b3bf579bdceb763bc7d863049cccf2 znc-0.098-alpha1.tar.gz
|
ee2d1bc0a1d02521d37ab71728eeee31 znc-0.098-beta.tar.gz
|
||||||
|
11
znc-release.patch
Normal file
11
znc-release.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- znc-0.098-beta-original/znc.cpp 2011-03-02 07:45:07.000000000 -0600
|
||||||
|
+++ znc-0.098-beta/znc.cpp 2011-03-03 16:48:07.752119484 -0600
|
||||||
|
@@ -96,7 +96,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
char szBuf[128];
|
||||||
|
- snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f"VERSION_EXTRA" - http://znc.in", VERSION);
|
||||||
|
+ snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f - http://znc.in", VERSION);
|
||||||
|
// If snprintf overflows (which I doubt), we want to be on the safe side
|
||||||
|
szBuf[sizeof(szBuf) - 1] = '\0';
|
||||||
|
|
11
znc.spec
11
znc.spec
@ -2,14 +2,15 @@ Summary: An advanced IRC bouncer
|
|||||||
Name: znc
|
Name: znc
|
||||||
Version: 0.098
|
Version: 0.098
|
||||||
#Release: 8.20110215git%{?dist}
|
#Release: 8.20110215git%{?dist}
|
||||||
Release: 0.1.alpha1%{?dist}
|
Release: 0.2.beta%{?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.in
|
URL: http://znc.in
|
||||||
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||||
#Source0: znc-0.097.tar.xz
|
#Source0: znc-0.097.tar.xz
|
||||||
Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-alpha1.tar.gz
|
Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-beta.tar.gz
|
||||||
|
Patch0: znc-release.patch
|
||||||
# git clone https://github.com/znc/znc.git
|
# git clone https://github.com/znc/znc.git
|
||||||
# cd znc
|
# cd znc
|
||||||
# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz
|
# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz
|
||||||
@ -64,7 +65,8 @@ perl module for ZNC
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
#%setup -q
|
#%setup -q
|
||||||
%setup -q -n %{name}-%{version}-alpha1
|
%setup -q -n %{name}-%{version}-beta
|
||||||
|
%patch0 -p1
|
||||||
%__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
|
||||||
|
|
||||||
@ -164,6 +166,9 @@ chmod -x modules/q.cpp
|
|||||||
%{_libdir}/znc/perleval.pm
|
%{_libdir}/znc/perleval.pm
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 02 2011 Nick Bebout <nb@fedoraproject.org> - 0.098-0.2.beta
|
||||||
|
- Update to znc-0.098-beta
|
||||||
|
|
||||||
* Wed Feb 23 2011 Nick Bebout <nb@fedoraproject.org> - 0.098-0.1.alpha1
|
* Wed Feb 23 2011 Nick Bebout <nb@fedoraproject.org> - 0.098-0.1.alpha1
|
||||||
- Update to znc 0.098-alpha1
|
- Update to znc 0.098-alpha1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user