From c5505ff782a15279fe17a77a568595bb9a177c81 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Sep 26 2007 08:25:28 +0000
Subject: apply xc284-improvescrollback.diff from upstream


---

diff --git a/xc284-improvescrollback.diff b/xc284-improvescrollback.diff
new file mode 100644
index 0000000..4bada74
--- /dev/null
+++ b/xc284-improvescrollback.diff
@@ -0,0 +1,28 @@
+#
+# 1) Stops scrollback files growing too large by fixing the file-shrink code.
+# 2) Puts a "Display scrollback from previous session" into the Setup GUI
+#    (logging section) so people can turn this off without typing commands.
+#
+--- xchat-2.8.4/src/common/text.c	29 Jul 2007 05:02:36 -0000	1.90
++++ xchat-2.8.4p1/src/common/text.c	26 Sep 2007 07:29:55 -0000
+@@ -285,6 +285,8 @@
+ 		}
+ 	}
+ 
++	sess->scrollwritten = lines;
++
+ 	if (lines)
+ 	{
+ 		text = ctime (&stamp);
+--- xchat-2.8.4/src/fe-gtk/setup.c	9 Sep 2007 04:57:07 -0000	1.100
++++ xchat-2.8.4p1/src/fe-gtk/setup.c	26 Sep 2007 07:29:57 -0000
+@@ -382,7 +382,8 @@
+ static const setting logging_settings[] =
+ {
+ 	{ST_HEADER,	N_("Logging"),0,0,0},
+-	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
++	{ST_TOGGLE,	N_("Display scrollback from previous session"), P_OFFINTNL(text_replay), 0, 0, 0},
++	{ST_TOGGLE,	N_("Enable logging of conversations"), P_OFFINTNL(logging), 0, 0, 2},
+ 	{ST_ENTRY,	N_("Log filename:"), P_OFFSETNL(logmask), 0, 0, sizeof prefs.logmask},
+ 	{ST_LABEL,	N_("%s=Server %c=Channel %n=Network.")},
+ 
diff --git a/xchat.spec b/xchat.spec
index b957077..555351b 100644
--- a/xchat.spec
+++ b/xchat.spec
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.4
-Release:   4%{?dist}.1
+Release:   5%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -14,6 +14,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Patches 0-9 reserved for official xchat.org patches
 # Fix creation of ~/.xchat2/scrollback/ paths.
 Patch0: xc284-scrollbmkdir.diff
+# 1) Stops scrollback files growing too large by fixing the file-shrink code.
+# 2) Puts a "Display scrollback from previous session" into the Setup GUI
+#    (logging section) so people can turn this off without typing commands.
+Patch1: xc284-improvescrollback.diff
 
 Patch10: xchat-2.8.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
@@ -62,6 +66,7 @@ This package contains the X-Chat plugin providing the Tcl scripting interface.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
@@ -157,6 +162,9 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Wed Sep 26 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1:2.8.4-5
+- apply xc284-improvescrollback.diff from upstream
+
 * Thu Aug 23 2007 Remi Collet <Fedora@FamilleCollet.com> - 1:2.8.4-4.fc8.1
 - F-8 rebuild (BuildID)