From e17a3df3719c3129222b84b68f5017940791f1f6 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Mon, 3 Jan 2011 19:03:46 -0500 Subject: [PATCH 1/5] rebuild for newer python3 (see rhbz#666429) --- znc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/znc.spec b/znc.spec index ad35ca5..369e6a0 100644 --- a/znc.spec +++ b/znc.spec @@ -1,7 +1,7 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 2.svn2214%{?dist} +Release: 3.svn2214%{?dist} #Release: 0.1.rc1%{?dist} #Release: 2%{?dist} License: GPLv2 with exceptions @@ -177,6 +177,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Mon Jan 3 2011 David Malcolm - 0.097-3.svn2214 +- rebuild for newer python3 (see rhbz#666429) + * Fri Dec 24 2010 Nick Bebout - 0.097-2.svn2214 - Patch has been upstreamed, update to svn2214 From 4b7d7ba796815897a3130f192617acb95c98bffe Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 7 Jan 2011 18:22:23 -0600 Subject: [PATCH 2/5] Update to svn2255 --- .gitignore | 1 + sources | 2 +- znc.spec | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5b0cf33..b735e9e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ znc-0.094.tar.gz /znc-0.097.svn2202.tar.bz2 /znc-0.097.svn2213.tar.bz2 /znc-0.097.svn2214.tar.bz2 +/znc-0.097.svn2255.tar.bz2 diff --git a/sources b/sources index c4512cc..94bd0ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a61e6fd9bac0a9cbbd17d352dab7b70c znc-0.097.svn2214.tar.bz2 +d2bb2fc0845c9500e0d0ef1532cb80a5 znc-0.097.svn2255.tar.bz2 diff --git a/znc.spec b/znc.spec index ad35ca5..82fe7d6 100644 --- a/znc.spec +++ b/znc.spec @@ -1,20 +1,20 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 2.svn2214%{?dist} +Release: 2.svn2255%{?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.svn2214.tar.bz2 -# svn export -r 2214 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2214 -# tar jcvf znc-0.097.svn2214.tar.bz2 znc-0.097.svn2214/ +Source0: znc-0.097.svn2255.tar.bz2 +# svn export -r 2255 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2255 +# tar jcvf znc-0.097.svn2255.tar.bz2 znc-0.097.svn2255/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: perl gcc-c++ +BuildRequires: perl gcc-c++ automake BuildRequires: openssl-devel >= 0.9.8 BuildRequires: cyrus-sasl-devel BuildRequires: c-ares-devel python3-devel @@ -73,11 +73,12 @@ python module for ZNC %prep #%setup -q -%setup -q -n znc-0.097.svn2214 +%setup -q -n znc-0.097.svn2255 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp %build +./autogen.sh %configure \ --with-module-prefix=%{_libdir}/znc \ --enable-ipv6 --enable-extra --enable-sasl --enable-perl --enable-tcl \ @@ -177,8 +178,8 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog -* Fri Dec 24 2010 Nick Bebout - 0.097-2.svn2214 -- Patch has been upstreamed, update to svn2214 +* Fri Dec 24 2010 Nick Bebout - 0.097-2.svn2255 +- Patch has been upstreamed, update to svn2255 * Wed Dec 22 2010 Nick Bebout - 0.097-1.svn2213 - Update to znc 0.097-svn2213 which also adds modpython From 09cb7a54c6a8c57300c299610e5a174c4767d2d1 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 7 Jan 2011 18:28:30 -0600 Subject: [PATCH 3/5] Fix merge --- znc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/znc.spec b/znc.spec index a6210cb..d91a888 100644 --- a/znc.spec +++ b/znc.spec @@ -178,7 +178,6 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog -<<<<<<< HEAD * Fri Jan 7 2011 Nick Bebout - 0.097-4.svn2255 - Update to svn2255 From 89a8e46cb2b3e1bc158ab1a6eff24074ea82626d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 17 Jan 2011 16:30:29 -0600 Subject: [PATCH 4/5] Update to svn2269 --- .gitignore | 1 + sources | 2 +- znc.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b735e9e..2da7e4e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ znc-0.094.tar.gz /znc-0.097.svn2213.tar.bz2 /znc-0.097.svn2214.tar.bz2 /znc-0.097.svn2255.tar.bz2 +/znc-0.097.svn2269.tar.bz2 diff --git a/sources b/sources index 94bd0ce..f0dfae3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2bb2fc0845c9500e0d0ef1532cb80a5 znc-0.097.svn2255.tar.bz2 +87004ac3d7b571cb4f57b162fed4679e znc-0.097.svn2269.tar.bz2 diff --git a/znc.spec b/znc.spec index d91a888..01aa8e8 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 4.svn2255%{?dist} +Release: 5.svn2269%{?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.svn2255.tar.bz2 -# svn export -r 2255 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2255 -# tar jcvf znc-0.097.svn2255.tar.bz2 znc-0.097.svn2255/ +Source0: znc-0.097.svn2269.tar.bz2 +# svn export -r 2269 https://znc.svn.sourceforge.net/svnroot/znc/trunk +# mv trunk znc-0.097.svn2269 +# tar jcvf znc-0.097.svn2269.tar.bz2 znc-0.097.svn2269/ 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.svn2255 +%setup -q -n znc-0.097.svn2269 %__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 +* Mon Jan 17 2011 Nick Bebout - 0.097-5.svn2269 +- Update to svn2269 + * Fri Jan 7 2011 Nick Bebout - 0.097-4.svn2255 - Update to svn2255 From 0393dbd7ba1db193640c48751d89bb51a2d66463 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Mon, 24 Jan 2011 11:22:13 -0600 Subject: [PATCH 5/5] Upgrade to svn2272 --- .gitignore | 1 + sources | 2 +- znc.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2da7e4e..cdb7727 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ znc-0.094.tar.gz /znc-0.097.svn2214.tar.bz2 /znc-0.097.svn2255.tar.bz2 /znc-0.097.svn2269.tar.bz2 +/znc-0.097.svn2272.tar.xz diff --git a/sources b/sources index f0dfae3..1de5ab7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87004ac3d7b571cb4f57b162fed4679e znc-0.097.svn2269.tar.bz2 +efc94ac63e6d4e4682a5978f3996da9e znc-0.097.svn2272.tar.xz diff --git a/znc.spec b/znc.spec index 01aa8e8..9b9e144 100644 --- a/znc.spec +++ b/znc.spec @@ -1,17 +1,17 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.097 -Release: 5.svn2269%{?dist} +Release: 6.svn2272%{?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.svn2269.tar.bz2 -# svn export -r 2269 https://znc.svn.sourceforge.net/svnroot/znc/trunk -# mv trunk znc-0.097.svn2269 -# tar jcvf znc-0.097.svn2269.tar.bz2 znc-0.097.svn2269/ +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/ 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.svn2269 +%setup -q -n znc-0.097.svn2272 %__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 +* Mon Jan 24 2011 Nick Bebout - 0.097-6.svn2272 +- Update to svn2272 + * Mon Jan 17 2011 Nick Bebout - 0.097-5.svn2269 - Update to svn2269