Upgrade to 0.2-alpha1

This commit is contained in:
Nick Bebout 2011-08-05 17:48:44 -05:00
parent 2a6fea2c11
commit aeec889eca
6 changed files with 54 additions and 17 deletions

2
.gitignore vendored
View File

@ -14,3 +14,5 @@ znc-0.094.tar.gz
/znc-0.098-beta.tar.gz
/znc-0.098-rc1.tar.gz
/znc-0.098.tar.gz
/znc-0.099.tar.xz
/znc-0.2-alpha1.tar.gz

View File

@ -1 +1 @@
5667b4acb1f01309d6eded77abac700c znc-0.098.tar.gz
44f8c2f2a06c83c00cc57cfe9cb600ec znc-0.2-alpha1.tar.gz

11
znc-modperl.patch Normal file
View File

@ -0,0 +1,11 @@
--- znc-0.2-alpha1-original/modules/modperl/Makefile.inc 2011-08-05 16:27:44.000000000 -0500
+++ znc-0.2-alpha1/modules/modperl/Makefile.inc 2011-08-05 17:24:25.658100254 -0500
@@ -43,7 +43,7 @@
@mkdir -p modperl
$(Q)$(PERL) $(srcdir)/modperl/codegen.pl $< $@
-modperl_install: create_install_dir modperl.so
+modperl_install: install_datadir modperl.so
for i in $(wildcard $(srcdir)/*.pm); do \
$(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \
done

11
znc-modpython.patch Normal file
View File

@ -0,0 +1,11 @@
--- znc-0.2-alpha1-original/modules/modpython/Makefile.inc 2011-08-05 16:27:44.000000000 -0500
+++ znc-0.2-alpha1/modules/modpython/Makefile.inc 2011-08-05 17:24:07.317001140 -0500
@@ -58,7 +58,7 @@
$(E) Building optimizer for python files...
$(Q)$(CXX) $(PYTHONCOMMON) -o $@ $< $(PY_LDFLAGS)
-modpython_install: create_install_dir modpython_all
+modpython_install: install_datadir modpython_all
-for i in *.pyc; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(MODDIR); \
done

View File

@ -1,10 +1,10 @@
--- 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 @@
--- znc-0.2-alpha1-original/znc.cpp 2011-08-05 16:27:44.000000000 -0500
+++ znc-0.2-alpha1/znc.cpp 2011-08-05 17:14:15.293147148 -0500
@@ -84,7 +84,7 @@
}
char szBuf[128];
- snprintf(szBuf, sizeof(szBuf), "ZNC %1.3f"VERSION_EXTRA" - http://znc.in", VERSION);
- snprintf(szBuf, sizeof(szBuf), "ZNC %1.1f"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';

View File

@ -1,17 +1,18 @@
Summary: An advanced IRC bouncer
Name: znc
Version: 0.098
#Release: 8.20110215git%{?dist}
#Release: 0.3.rc1%{?dist}
Release: 2%{?dist}
Version: 0.2
#Release: 0.1.20110801git%{?dist}
Release: 0.1.alpha1%{?dist}
#Release: 1%{?dist}
License: GPLv2 with exceptions
Group: System Environment/Daemons
URL: http://znc.in
#Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
#Source0: znc-0.097.tar.xz
#Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-rc1.tar.gz
Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098.tar.gz
#Patch0: znc-release.patch
#Source0: znc-0.099.tar.xz
Source0: http://people.znc.in/~psychon/znc/releases/znc-0.2-alpha1.tar.gz
#Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098.tar.gz
Patch0: znc-release.patch
Patch1: znc-modperl.patch
Patch2: znc-modpython.patch
# git clone https://github.com/znc/znc.git
# cd znc
# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz
@ -75,9 +76,12 @@ Requires: python3
python module for ZNC
%prep
%setup -q
#%setup -q -n %{name}-alpha1
%setup -q -n znc-0.2-alpha1
#%setup -q -n %{name}-%{version}-rc1
#%patch0 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
chmod -x modules/q.cpp
@ -110,14 +114,16 @@ chmod -x modules/q.cpp
%{_libdir}/znc/away.so
%{_libdir}/znc/awaynick.so
%{_libdir}/znc/blockuser.so
%{_libdir}/znc/bouncedcc.so
%{_libdir}/znc/buffextras.so
%{_libdir}/znc/cert.so
%{_libdir}/znc/certauth.so
%{_libdir}/znc/chansaver.so
%{_libdir}/znc/clientnotify.so
%{_libdir}/znc/crypt.so
%{_libdir}/znc/disconkick.so
%{_libdir}/znc/fail2ban.so
%{_libdir}/znc/fixfreenode.so
%{_libdir}/znc/identfile.so
%{_libdir}/znc/keepnick.so
%{_libdir}/znc/kickrejoin.so
%{_libdir}/znc/lastseen.so
@ -154,6 +160,7 @@ chmod -x modules/q.cpp
%{_libdir}/znc/charset.so
%{_libdir}/znc/clearbufferonmsg.so
%{_libdir}/znc/ctcpflood.so
%{_libdir}/znc/dcc.so
%{_libdir}/znc/droproot.so
%{_libdir}/znc/email.so
%{_libdir}/znc/fakeonline.so
@ -183,6 +190,12 @@ chmod -x modules/q.cpp
%{_libdir}/znc/modpython.so
%changelog
* Fri Aug 5 2011 Nick Bebout <nb@fedoraproject.org> - 0.2-0.1.alpha1
- Update to 0.2-alpha1
* Mon Aug 1 2011 Nick Bebout <nb@fedoraproject.org> - 0.099-0.1.20110801git
- Update to latest git
* Sat Apr 2 2011 Nick Bebout <nb@fedoraproject.org> - 0.098-2
- Add provides for ZNC::Module to znc-modperl