From aeec889ecaae7b17e536402f15a5a1198bd409b4 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 5 Aug 2011 17:48:44 -0500 Subject: [PATCH] Upgrade to 0.2-alpha1 --- .gitignore | 2 ++ sources | 2 +- znc-modperl.patch | 11 +++++++++++ znc-modpython.patch | 11 +++++++++++ znc-release.patch | 8 ++++---- znc.spec | 37 +++++++++++++++++++++++++------------ 6 files changed, 54 insertions(+), 17 deletions(-) create mode 100644 znc-modperl.patch create mode 100644 znc-modpython.patch diff --git a/.gitignore b/.gitignore index dab5bd1..92ed405 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/sources b/sources index fce376f..ee39203 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5667b4acb1f01309d6eded77abac700c znc-0.098.tar.gz +44f8c2f2a06c83c00cc57cfe9cb600ec znc-0.2-alpha1.tar.gz diff --git a/znc-modperl.patch b/znc-modperl.patch new file mode 100644 index 0000000..cd4276f --- /dev/null +++ b/znc-modperl.patch @@ -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 diff --git a/znc-modpython.patch b/znc-modpython.patch new file mode 100644 index 0000000..c113c2e --- /dev/null +++ b/znc-modpython.patch @@ -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 diff --git a/znc-release.patch b/znc-release.patch index bcd9147..6e8c727 100644 --- a/znc-release.patch +++ b/znc-release.patch @@ -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'; diff --git a/znc.spec b/znc.spec index d22270c..7fe2bf7 100644 --- a/znc.spec +++ b/znc.spec @@ -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 - 0.2-0.1.alpha1 +- Update to 0.2-alpha1 + +* Mon Aug 1 2011 Nick Bebout - 0.099-0.1.20110801git +- Update to latest git + * Sat Apr 2 2011 Nick Bebout - 0.098-2 - Add provides for ZNC::Module to znc-modperl