dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-xchat-gnome-0.17.tar.bz2

.gitignore

@@ -0,0 +1 @@
+xchat-gnome-0.18.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xchat-gnome
-# $Id$
-NAME := xchat-gnome
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-bcb8e97a63c0fda6fcba0f88309ea645  xchat-gnome-0.17.tar.bz2
+4976cd34a0e9115c800b5d317e121182  xchat-gnome-0.18.tar.bz2

xchat-gnome-0.17-setup-dialog.patch

@@ -1,79 +0,0 @@
---- trunk/src/fe-gnome/setup-dialog.c	2007/03/19 00:05:08	2491
-+++ trunk/src/fe-gnome/setup-dialog.c	2007/04/15 00:56:09	2513
-@@ -29,7 +29,9 @@
- #include "util.h"
- #include "preferences.h"
- 
--static GladeXML *xml = NULL;
-+static GtkWidget *real_entry = NULL;
-+static GtkWidget *nick_entry = NULL;
-+static GtkWidget *ok_button = NULL;
- static gboolean done;
- 
- static void ok_clicked (GtkButton *button, gpointer data);
-@@ -37,12 +39,6 @@
- 
- void run_setup_dialog (void)
- {
--	GtkSizeGroup *group;
--	GtkWidget *window;
--	GtkWidget *nick_entry;
--	GtkWidget *real_entry;
--	GtkWidget *button;
--
- 	gchar *path = locate_data_file ("setup-dialog.glade");
- 	g_assert (path != NULL);
- 
-@@ -51,9 +47,9 @@
- 
- 	g_free (path);
- 
--	window = glade_xml_get_widget (xml, "setup window");
-+	GtkWidget *window = glade_xml_get_widget (xml, "setup window");
- 
--	group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-+	GtkSizeGroup *group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- 	nick_entry = glade_xml_get_widget (xml, "nick name entry");
- 	real_entry = glade_xml_get_widget (xml, "real name entry");
- 	gtk_size_group_add_widget (group, nick_entry);
-@@ -66,8 +62,8 @@
- 	gtk_entry_set_text (GTK_ENTRY (real_entry), g_get_real_name ());
- 	gtk_widget_grab_focus (nick_entry);
- 
--	button = glade_xml_get_widget (xml, "ok button");
--	g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (ok_clicked), NULL);
-+	ok_button = glade_xml_get_widget (xml, "ok button");
-+	g_signal_connect (G_OBJECT (ok_button), "clicked", G_CALLBACK (ok_clicked), NULL);
- 
- 	gtk_widget_show_all (window);
- 	done = FALSE;
-@@ -82,8 +78,6 @@
- static void
- ok_clicked (GtkButton *button, gpointer data)
- {
--	GtkWidget *nick_entry = glade_xml_get_widget (xml, "nick name entry");
--	GtkWidget *real_entry = glade_xml_get_widget (xml, "real name entry");
- 	const gchar *nick = gtk_entry_get_text (GTK_ENTRY (nick_entry));
- 	const gchar *real = gtk_entry_get_text (GTK_ENTRY (real_entry));
- 
-@@ -108,16 +102,11 @@
- static void
- entry_changed (GtkEditable *entry, gpointer user_data)
- {
--	GtkWidget *ok_button, *nick_entry, *real_entry;
--	const gchar *nick, *real;
--
--	ok_button = glade_xml_get_widget (xml, "ok button");
--	nick_entry = glade_xml_get_widget (xml, "nick name entry");
--	real_entry = glade_xml_get_widget (xml, "real name entry");
--	nick = gtk_entry_get_text (GTK_ENTRY (nick_entry));
--	real = gtk_entry_get_text (GTK_ENTRY (real_entry));
-+	const gchar *nick = gtk_entry_get_text (GTK_ENTRY (nick_entry));
-+	const gchar *real = gtk_entry_get_text (GTK_ENTRY (real_entry));
- 
--	if (strlen(nick) == 0 || strlen(real) == 0) {
-+	if ((nick == NULL || strlen(nick) == 0) ||
-+	    (real == NULL || strlen(real) == 0)) {
- 		gtk_widget_set_sensitive (ok_button, FALSE);
- 	} else {
- 		gtk_widget_set_sensitive (ok_button, TRUE);

xchat-gnome-0.17-static.patch

@@ -1,17 +0,0 @@
-diff -ur xchat-gnome-0.17.OLD/src/fe-gnome/preferences.c xchat-gnome-0.17/src/fe-gnome/preferences.c
---- xchat-gnome-0.17.OLD/src/fe-gnome/preferences.c	2007-03-06 17:47:37.000000000 -0500
-+++ xchat-gnome-0.17/src/fe-gnome/preferences.c	2007-04-03 20:23:51.000000000 -0400
-@@ -163,9 +163,11 @@
- gchar *
- get_save_directory(void)
- {
--	char *dir = prefs.dccdir;
--	if (0 == strlen (dir)) {
-+	char *dir;
-+	if (0 == strlen (prefs.dccdir)) {
- 		dir = NULL;
-+	} else {
-+		dir = g_strdup (prefs.dccdir);
- 	}
- 
- 	/* Starts with ~/ ? */

xchat-gnome-0.18-config.patch

@@ -1,6 +1,6 @@
-diff -ur xchat-gnome-0.17.OLD/plugins/perl/perl.c xchat-gnome-0.17/plugins/perl/perl.c
---- xchat-gnome-0.17.OLD/plugins/perl/perl.c	2007-03-06 17:47:26.000000000 -0500
-+++ xchat-gnome-0.17/plugins/perl/perl.c	2007-04-02 08:40:39.000000000 -0400
+diff -ur xchat-gnome-0.18.OLD/plugins/perl/perl.c xchat-gnome-0.18/plugins/perl/perl.c
+--- xchat-gnome-0.18.OLD/plugins/perl/perl.c	2007-03-06 17:47:26.000000000 -0500
++++ xchat-gnome-0.18/plugins/perl/perl.c	2007-07-09 10:24:01.000000000 -0400
 @@ -92,7 +92,7 @@
  	if (!xdir)						  /* xchatdirfs is new for 2.0.9, will fail on older */
  		xdir = xchat_get_info (ph, "xchatdir");
@@ -10,10 +10,11 @@ diff -ur xchat-gnome-0.17.OLD/plugins/perl/perl.c xchat-gnome-0.17/plugins/perl/
  	perl_auto_load_from_path (xdir);
  
  #ifdef WIN32
-diff -ur xchat-gnome-0.17.OLD/plugins/python/python.c xchat-gnome-0.17/plugins/python/python.c
---- xchat-gnome-0.17.OLD/plugins/python/python.c	2007-03-06 17:47:26.000000000 -0500
-+++ xchat-gnome-0.17/plugins/python/python.c	2007-04-02 08:41:13.000000000 -0400
-@@ -412,7 +412,7 @@
+Only in xchat-gnome-0.18/plugins/perl: perl.c~
+diff -ur xchat-gnome-0.18.OLD/plugins/python/python.c xchat-gnome-0.18/plugins/python/python.c
+--- xchat-gnome-0.18.OLD/plugins/python/python.c	2007-07-07 16:28:05.000000000 -0400
++++ xchat-gnome-0.18/plugins/python/python.c	2007-07-09 10:24:20.000000000 -0400
+@@ -414,7 +414,7 @@
  		return expanded;
  	g_free(expanded);
  
@@ -22,9 +23,10 @@ diff -ur xchat-gnome-0.17.OLD/plugins/python/python.c xchat-gnome-0.17/plugins/p
  	expanded = g_build_filename(xchat_get_info(ph, "xchatdir"),
  				    filename, NULL);
  	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
-diff -ur xchat-gnome-0.17.OLD/src/common/cfgfiles.c xchat-gnome-0.17/src/common/cfgfiles.c
---- xchat-gnome-0.17.OLD/src/common/cfgfiles.c	2007-03-17 21:40:09.000000000 -0400
-+++ xchat-gnome-0.17/src/common/cfgfiles.c	2007-04-02 08:39:50.000000000 -0400
+Only in xchat-gnome-0.18/plugins/python: python.c~
+diff -ur xchat-gnome-0.18.OLD/src/common/cfgfiles.c xchat-gnome-0.18/src/common/cfgfiles.c
+--- xchat-gnome-0.18.OLD/src/common/cfgfiles.c	2007-06-12 20:03:17.000000000 -0400
++++ xchat-gnome-0.18/src/common/cfgfiles.c	2007-07-09 10:26:09.000000000 -0400
 @@ -34,7 +34,7 @@
  #ifdef WIN32
  #define XCHAT_DIR "X-Chat 2"
@@ -34,7 +36,7 @@ diff -ur xchat-gnome-0.17.OLD/src/common/cfgfiles.c xchat-gnome-0.17/src/common/
  #endif
  #define DEF_FONT "Monospace 9"
  
-@@ -352,7 +352,7 @@
+@@ -351,7 +351,7 @@
  #else
  		if (mkdir (dir, S_IRUSR | S_IWUSR | S_IXUSR) != 0)
  #endif
@@ -43,9 +45,10 @@ diff -ur xchat-gnome-0.17.OLD/src/common/cfgfiles.c xchat-gnome-0.17/src/common/
  	}
  }
  
-diff -ur xchat-gnome-0.17.OLD/src/common/fe.h xchat-gnome-0.17/src/common/fe.h
---- xchat-gnome-0.17.OLD/src/common/fe.h	2007-03-06 17:47:37.000000000 -0500
-+++ xchat-gnome-0.17/src/common/fe.h	2007-04-02 08:40:15.000000000 -0400
+Only in xchat-gnome-0.18/src/common: cfgfiles.c~
+diff -ur xchat-gnome-0.18.OLD/src/common/fe.h xchat-gnome-0.18/src/common/fe.h
+--- xchat-gnome-0.18.OLD/src/common/fe.h	2007-06-12 20:21:16.000000000 -0400
++++ xchat-gnome-0.18/src/common/fe.h	2007-07-09 10:25:46.000000000 -0400
 @@ -106,7 +106,7 @@
  void fe_get_int (char *prompt, int def, void *callback, void *ud);
  #define FRF_WRITE 1	/* save file */
@@ -55,9 +58,10 @@ diff -ur xchat-gnome-0.17.OLD/src/common/fe.h xchat-gnome-0.17/src/common/fe.h
  #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
  #define FRF_FILTERISINITIAL 16	/* unused */
  #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
-diff -ur xchat-gnome-0.17.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.17/src/fe-gnome/preferences-page-plugins.c
---- xchat-gnome-0.17.OLD/src/fe-gnome/preferences-page-plugins.c	2007-03-31 07:07:34.000000000 -0400
-+++ xchat-gnome-0.17/src/fe-gnome/preferences-page-plugins.c	2007-04-02 08:39:21.000000000 -0400
+Only in xchat-gnome-0.18/src/common: fe.h~
+diff -ur xchat-gnome-0.18.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.18/src/fe-gnome/preferences-page-plugins.c
+--- xchat-gnome-0.18.OLD/src/fe-gnome/preferences-page-plugins.c	2007-03-31 07:07:34.000000000 -0400
++++ xchat-gnome-0.18/src/fe-gnome/preferences-page-plugins.c	2007-07-09 10:25:27.000000000 -0400
 @@ -240,7 +240,7 @@
  	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
  
@@ -76,3 +80,4 @@ diff -ur xchat-gnome-0.17.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnom
  	for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
  	for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);
  	for_files (XCHATLIBDIR "/plugins", "*.py", fe_plugin_add);
+Only in xchat-gnome-0.18/src/fe-gnome: preferences-page-plugins.c~

xchat-gnome-0.18-reconnect.patch

@@ -0,0 +1,26 @@
+--- trunk/plugins/net-monitor/net-monitor.c	2007/09/12 22:18:13	2568
++++ trunk/plugins/net-monitor/net-monitor.c	2007/09/13 01:25:13	2569
+@@ -30,6 +30,9 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <string.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#include <resolv.h>
+ #include "xchat-plugin.h"
+ 
+ #define NET_MONITOR_VERSION     "0.1"
+@@ -166,6 +169,13 @@
+ 
+ 		g_hash_table_foreach (networks, (GHFunc) disconnect_from_network, NULL);
+ 	} else {
++		/*
++		 * We need to tell the nameserver resolver to reread
++		 * /etc/resolve.conf, since the nameservers might have changed
++		 * when moving between networks.
++		 */
++		res_init();
++
+ 		g_hash_table_foreach (networks, (GHFunc) connect_to_network, NULL);
+ 	}
+ }

xchat-gnome.spec

@@ -1,15 +1,14 @@
 Name:           xchat-gnome
-Version:        0.17
-Release:        4%{?dist}
+Version:        0.18
+Release:        3%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2+
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-%{version}-config.patch
-Patch1:		%{name}-%{version}-static.patch
-Patch2:		%{name}-%{version}-setup-dialog.patch
+Patch1:		%{name}-%{version}-reconnect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -24,7 +23,6 @@ BuildRequires:	gnome-doc-utils
 BuildRequires:	libnotify-devel
 
 Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -44,8 +42,7 @@ common settings will be included in the main user interface. .
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
-%patch1 -p1 -b .static
-%patch2 -p1 -b .dialog
+%patch1 -p1 -b .reconnect
 
 
 %build
@@ -131,6 +128,19 @@ fi
 
 
 %changelog
+* Thu Sep 13 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.18-3
+- Add patch to fix reconnect bug. (#225408)
+
+* Thu Aug  2 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.18-2
+- Update license tag.
+
+* Mon Jul  9 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.18-1
+- Drop requires on python, since dep on python-libs will be pulled in.
+- Update to 0.18.
+- Drop static patch, fixed upstream.
+- Drop setup-dialog patch, fixed upstream.
+- Update config patch.
+
 * Mon Apr 16 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.17-4
 - Add patch to fix setup-dialog. (#236636)