rpms/xchat/devel xc284-scrollbmkdir.diff, NONE, 1.1 xchat.spec, 1.74, 1.75

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/xchat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22887/devel

Modified Files:
	xchat.spec 
Added Files:
	xc284-scrollbmkdir.diff 
Log Message:
Apply xc284-scrollbmkdir.diff from upstream.

xc284-scrollbmkdir.diff:

--- NEW FILE xc284-scrollbmkdir.diff ---
#
# Fix creation of ~/.xchat2/scrollback/ paths.
#
--- xchat-2.8.4/src/common/text.c	15 Jun 2007 03:53:42 -0000	1.89
+++ xchat-2.8.4p1/src/common/text.c	8 Jul 2007 08:59:02 -0000
@@ -49,20 +49,25 @@
 
 
 static void mkdir_p (char *dir);
+static char *log_create_filename (char *channame);
 
 
 static char *
 scrollback_get_filename (session *sess, char *buf, int max)
 {
-	char *net;
+	char *net, *chan;
 
 	net = server_get_network (sess->server, FALSE);
 	if (!net)
 		return NULL;
 
-	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, sess->channel);
+	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, "");
 	mkdir_p (buf);
 
+	chan = log_create_filename (sess->channel);
+	snprintf (buf, max, "%s/scrollback/%s/%s.txt", get_xdir_fs (), net, chan);
+	free (chan);
+
 	return buf;
 }
 


Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/devel/xchat.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xchat.spec	4 Jul 2007 10:17:05 -0000	1.74
+++ xchat.spec	10 Jul 2007 18:45:09 -0000	1.75
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.4
-Release:   1%{?dist}
+Release:   2%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -12,6 +12,8 @@
 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
 
 Patch10: xchat-2.8.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
@@ -59,6 +61,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %patch10 -p1 -b .desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
@@ -154,6 +157,9 @@
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Tue Jul 10 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-2
+- apply xc284-scrollbmkdir.diff from upstream
+
 * Wed Jul  4 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.4-1
 - update to 2.8.4
 - drop xc282-fixtrayzombies.diff (already in 2.8.4)