From abe48fa44ff6e367dfde7834524883c7c55b63a3 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 9 Feb 2011 20:20:09 +0000 Subject: [PATCH 1/4] Upgrade to svn2277 --- .gitignore | 1 + sources | 2 +- znc.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index cdb7727..01d61ce 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ znc-0.094.tar.gz /znc-0.097.svn2255.tar.bz2 /znc-0.097.svn2269.tar.bz2 /znc-0.097.svn2272.tar.xz +/znc-0.097.svn2277.tar.xz diff --git a/sources b/sources index 1de5ab7..9f310c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efc94ac63e6d4e4682a5978f3996da9e znc-0.097.svn2272.tar.xz +9a1ee24e4d38c5adabb761fa586c3830 znc-0.097.svn2277.tar.xz diff --git a/znc.spec b/znc.spec index 9b9e144..02fb14a 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 6.svn2272%{?dist} +Release: 7.svn2277%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2272.tar.xz -# svn export -r 2272 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2272 -# tar Jcvf znc-0.097.svn2272.tar.xz znc-0.097.svn2272/ +Source0: znc-0.097.svn2277.tar.xz +# svn export -r 2277 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2277 +# tar Jcvf znc-0.097.svn2277.tar.xz znc-0.097.svn2277/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ automake @@ -73,7 +73,7 @@ python module for ZNC %prep #%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 chmod -x modules/q.cpp @@ -178,6 +178,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Wed Feb 09 2011 Nick Bebout - 0.097-7.svn2277 +- Update to svn2277 + * Mon Jan 24 2011 Nick Bebout - 0.097-6.svn2272 - Update to svn2272 From 82c7dfc65645bcd9649c2066752136a5aa705781 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Tue, 15 Feb 2011 18:25:29 -0600 Subject: [PATCH 2/4] Update to latest git --- .gitignore | 1 + sources | 2 +- znc.spec | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cdb7727..7e9929f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ znc-0.094.tar.gz /znc-0.097.svn2255.tar.bz2 /znc-0.097.svn2269.tar.bz2 /znc-0.097.svn2272.tar.xz +/znc-0.097.tar.xz diff --git a/sources b/sources index 1de5ab7..44b78f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efc94ac63e6d4e4682a5978f3996da9e znc-0.097.svn2272.tar.xz +ef4368c196707c6cd93ef8591332bb30 znc-0.097.tar.xz diff --git a/znc.spec b/znc.spec index 9b9e144..5c0efb6 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 6.svn2272%{?dist} +Release: 8.20110215git%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons -URL: http://znc.sf.net/ +URL: http://znc.in #Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source0: znc-0.097.svn2272.tar.xz -# svn export -r 2272 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2272 -# tar Jcvf znc-0.097.svn2272.tar.xz znc-0.097.svn2272/ +Source0: znc-0.097.tar.xz +# git clone https://github.com/znc/znc.git +# cd znc +# git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: perl gcc-c++ automake @@ -73,7 +73,7 @@ python module for ZNC %prep #%setup -q -%setup -q -n znc-0.097.svn2272 +%setup -q -n %{name} %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -94,7 +94,7 @@ chmod -x modules/q.cpp %files %defattr(-,root,root) -%doc AUTHORS LICENSE LICENSE.OpenSSL README +%doc AUTHORS LICENSE LICENSE.OpenSSL README.md %{_bindir}/znc %{_mandir}/man1/* %{_libdir}/znc/admin.so @@ -178,6 +178,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Tue Feb 15 2011 Nick Bebout - 0.097-8.20110215git +- Update to latest git + * Mon Jan 24 2011 Nick Bebout - 0.097-6.svn2272 - Update to svn2272 From ed87c40397208423309e81cfb1503fa361d005f8 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 24 Feb 2011 18:32:20 -0600 Subject: [PATCH 3/4] Remove old patches, update to 0.098-alpha1 --- znc-0.097.svn2213-modpython.patch | 23 ----------------------- znc.spec | 26 +++++++++++++++----------- 2 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 znc-0.097.svn2213-modpython.patch diff --git a/znc-0.097.svn2213-modpython.patch b/znc-0.097.svn2213-modpython.patch deleted file mode 100644 index cce800b..0000000 --- a/znc-0.097.svn2213-modpython.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- znc-0.097.svn2213/modules/modpython/compiler.cpp 2010-12-22 08:52:53.106613000 -0600 -+++ znc-0.097.svn2213-fixed/modules/modpython/compiler.cpp 2010-12-24 22:49:47.076861076 -0600 -@@ -8,9 +8,18 @@ - - #include - --int main() { -+int main(int argc, char** argv) { - Py_Initialize(); -- int res = PyRun_SimpleString("import compileall; print('Optimizing python files for later use...'); compileall.compile_dir('.')"); -+ int res = PyRun_SimpleString( -+ "import compileall\n" -+ "print('Optimizing python files for later use...')\n" -+ "import sys\n" -+ "if sys.version_info < (3, 2):\n" -+ " compileall.compile_dir('.')\n" -+ "else:\n" -+ " compileall.compile_dir('.', legacy=True)\n" -+ ); - Py_Finalize(); - return res; - } -+ diff --git a/znc.spec b/znc.spec index 220c810..51d98ae 100644 --- a/znc.spec +++ b/znc.spec @@ -1,23 +1,24 @@ Summary: An advanced IRC bouncer Name: znc -Version: 0.097 -Release: 8.20110215git%{?dist} -#Release: 0.1.rc1%{?dist} +Version: 0.098 +#Release: 8.20110215git%{?dist} +Release: 0.1.alpha1%{?dist} #Release: 2%{?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: znc-0.097.tar.xz +Source0: http://people.znc.in/~psychon/znc/releases/znc-0.098-alpha1.tar.gz # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl gcc-c++ automake +BuildRequires: perl gcc-c++ BuildRequires: openssl-devel >= 0.9.8 -BuildRequires: cyrus-sasl-devel -BuildRequires: c-ares-devel python3-devel +BuildRequires: cyrus-sasl-devel python3-devel +BuildRequires: c-ares-devel automake BuildRequires: perl(ExtUtils::Embed) swig tcl-devel %description @@ -70,10 +71,9 @@ Requires: python3 %description modpython python module for ZNC - %prep #%setup -q -%setup -q -n %{name} +%setup -q -n %{name}-%{version}-alpha1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -81,8 +81,8 @@ chmod -x modules/q.cpp ./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ - --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \ - --enable-python + --enable-ipv6 --enable-extra --enable-sasl --enable-perl \ + --enable-tcl --enable-python %__make %{?_smp_mflags} %install @@ -171,6 +171,7 @@ chmod -x modules/q.cpp %defattr(-,root,root) %{_libdir}/znc/modperl/ %{_libdir}/znc/modperl.so +%{_libdir}/znc/perleval.pm %files modpython %defattr(-,root,root) @@ -178,6 +179,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Wed Feb 23 2011 Nick Bebout - 0.098-0.1.alpha1 +- Update to znc 0.098-alpha1 + * Tue Feb 15 2011 Nick Bebout - 0.097-8.20110215git - Update to latest git From 0a5ad7b0f0740b5f4b397a119702a9c9baed054d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 24 Feb 2011 19:17:05 -0600 Subject: [PATCH 4/4] Oops, I should probably update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 86cd0ba..f917da8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ znc-0.094.tar.gz /znc-0.097.svn2272.tar.xz /znc-0.097.svn2277.tar.xz /znc-0.097.tar.xz +/znc-0.098-alpha1.tar.gz diff --git a/sources b/sources index 44b78f1..0d08cba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef4368c196707c6cd93ef8591332bb30 znc-0.097.tar.xz +88b3bf579bdceb763bc7d863049cccf2 znc-0.098-alpha1.tar.gz