- fix building with new glib2

- rel 5

diff --git a/glib.patch b/glib.patch
new file mode 100644 (file)
index 0000000..b990978
--- /dev/null
+++ b/glib.patch
@@ -0,0 +1,14 @@
+--- /home/users/baggins/devel/PLD/rpm/BUILD/xchat-2.8.8/src/common/xchat.h~    2009-08-16 11:40:16.000000000 +0200
++++ /home/users/baggins/devel/PLD/rpm/BUILD/xchat-2.8.8/src/common/xchat.h     2013-06-11 13:44:45.861175558 +0200
+@@ -1,10 +1,6 @@
+ #include "../../config.h"
+ 
+-#include <glib/gslist.h>
+-#include <glib/glist.h>
+-#include <glib/gutils.h>
+-#include <glib/giochannel.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <time.h>                     /* need time_t */
+ 
+ #ifndef XCHAT_H

diff --git a/xchat.spec b/xchat.spec
index ad7d30e9b5bb55931ba408379ef1b7a0b7ceecfd..b7fabfcebebd8ad5c7c6997aaf28d5e091ed590c 100644 (file)
--- a/xchat.spec
+++ b/xchat.spec
@@ -21,7 +21,7 @@ Summary(uk.UTF-8):    GTK+ IRC клієнт
 Summary(zh_CN.UTF-8):  GTK+ IRC (聊天) 客户。
 Name:          xchat
 Version:       2.8.8
-Release:       4
+Release:       5
 Epoch:         1
 License:       GPL v2
 Group:         X11/Applications/Networking
@@ -33,6 +33,7 @@ Patch1:               %{name}-locale_names.patch
 Patch2:                %{name}-long-delimiter.patch
 Patch3:                %{name}-domains.patch
 Patch4:                %{name}-gtk_2_14.patch
+Patch5:                glib.patch
 URL:           http://www.xchat.org/
 BuildRequires: GConf2-devel
 BuildRequires: autoconf
@@ -140,6 +141,7 @@ X-Chat - ще один IRC клієнт для X Window System, який вик
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 cp %{SOURCE1} po/pl.po