rpms/xchat/F-7 xc284-improvescrollback.diff, NONE, 1.1 xchat.spec, 1.73, 1.74

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16534/F-7

Modified Files:
	xchat.spec 
Added Files:
	xc284-improvescrollback.diff 
Log Message:
Sync from devel:
- add missing BR perl(ExtUtils::Embed)
- apply xc284-improvescrollback.diff from upstream

xc284-improvescrollback.diff:

--- NEW FILE xc284-improvescrollback.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.
#
--- 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.")},
 


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-7/xchat.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xchat.spec	3 Aug 2007 01:16:16 -0000	1.73
+++ xchat.spec	26 Sep 2007 08:29:12 -0000	1.74
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.4
-Release:   3%{?dist}
+Release:   5%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -14,6 +14,10 @@
 # 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
@@ -24,7 +28,7 @@
 # see #241923
 Patch35: xchat-2.8.4-disable-tray-icon-by-default.patch
 
-BuildRequires: perl python-devel openssl-devel pkgconfig, tcl-devel
+BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
 BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
 BuildRequires: glib2-devel >= 2.10.0, gtk2-devel >= 2.10.0, bison >= 1.35
@@ -62,6 +66,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
@@ -157,8 +162,17 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Wed Sep 26 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-5
+- apply xc284-improvescrollback.diff from upstream
+
+* Thu Aug 23 2007 Remi Collet <Fedora at FamilleCollet.com> - 1:2.8.4-4.fc8.1
+- F-8 rebuild (BuildID)
+
+* Sat Aug 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-4
+- add missing BR perl(ExtUtils::Embed)
+
 * Fri Aug  3 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-3
-- Specify GPL version in License tag.
+- specify GPL version in License tag
 
 * Tue Jul 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-2
 - apply xc284-scrollbmkdir.diff from upstream