From 657a45ff3830a31f9f15a29f6fea0e7f02ad969a Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 3 Mar 2011 16:32:31 -0600 Subject: [PATCH 1/2] Upgrade to 0.098-beta --- .gitignore | 1 + sources | 2 +- znc.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f917da8..21692d4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ znc-0.094.tar.gz /znc-0.097.svn2277.tar.xz /znc-0.097.tar.xz /znc-0.098-alpha1.tar.gz +/znc-0.098-beta.tar.gz diff --git a/sources b/sources index 0d08cba..eaa5888 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88b3bf579bdceb763bc7d863049cccf2 znc-0.098-alpha1.tar.gz +ee2d1bc0a1d02521d37ab71728eeee31 znc-0.098-beta.tar.gz diff --git a/znc.spec b/znc.spec index 51d98ae..e17cb0f 100644 --- a/znc.spec +++ b/znc.spec @@ -2,14 +2,14 @@ Summary: An advanced IRC bouncer Name: znc Version: 0.098 #Release: 8.20110215git%{?dist} -Release: 0.1.alpha1%{?dist} +Release: 0.2.beta%{?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: 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 # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -73,7 +73,7 @@ python module for ZNC %prep #%setup -q -%setup -q -n %{name}-%{version}-alpha1 +%setup -q -n %{name}-%{version}-beta %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp @@ -179,6 +179,9 @@ chmod -x modules/q.cpp %{_libdir}/znc/modpython.so %changelog +* Wed Mar 02 2011 Nick Bebout - 0.098-0.2.beta +- Update to znc-0.098-beta + * Wed Feb 23 2011 Nick Bebout - 0.098-0.1.alpha1 - Update to znc 0.098-alpha1 From bfb86d836c714140774e161949900e77059b031c Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Thu, 3 Mar 2011 17:12:20 -0600 Subject: [PATCH 2/2] Add patch so znc's version doesn't get messed up with prereleases --- znc-release.patch | 11 +++++++++++ znc.spec | 2 ++ 2 files changed, 13 insertions(+) create mode 100644 znc-release.patch diff --git a/znc-release.patch b/znc-release.patch new file mode 100644 index 0000000..bcd9147 --- /dev/null +++ b/znc-release.patch @@ -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'; + diff --git a/znc.spec b/znc.spec index e17cb0f..31cfd49 100644 --- a/znc.spec +++ b/znc.spec @@ -10,6 +10,7 @@ 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-beta.tar.gz +Patch0: znc-release.patch # git clone https://github.com/znc/znc.git # cd znc # git archive --prefix=znc/ HEAD | xz > ../znc-0.097.tar.xz @@ -74,6 +75,7 @@ python module for ZNC %prep #%setup -q %setup -q -n %{name}-%{version}-beta +%patch0 -p1 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp chmod -x modules/q.cpp