- rel 15; add all debian patches (on df because too big for git hooks)

diff --git a/glib.patch b/glib.patch
deleted file mode 100644 (file)
index 5e981c3..0000000
--- a/glib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xchat-2.8.8/src/common/xchat.h~    2009-08-16 11:40:16.000000000 +0200
-+++ 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-desktop.patch b/xchat-desktop.patch
index aeb4ddbb2f101aeeaa0a3d6c92a1504236cb267a..84b515178c9ea279040d2615a7eabf698c55c33f 100644 (file)
--- a/xchat-desktop.patch
+++ b/xchat-desktop.patch
@@ -1,7 +1,6 @@
-diff -uNr xchat-2.8.4.orig/xchat.desktop xchat-2.8.4/xchat.desktop
---- xchat-2.8.4.orig/xchat.desktop     2007-06-23 15:50:27.000000000 +0000
-+++ xchat-2.8.4/xchat.desktop  2007-07-04 13:14:36.000000000 +0000
-@@ -8,16 +8,18 @@
+--- xchat-2.8.8/xchat.desktop~ 2018-09-20 18:51:46.000000000 +0200
++++ xchat-2.8.8/xchat.desktop  2018-09-20 18:52:51.804071052 +0200
+@@ -8,17 +8,19 @@ Comment[fi]=IRC-sovellus
  Comment[fr]=Client IRC
  Comment[hu]=IRC-kliens
  Comment[lt]=IRC klientas
@@ -15,10 +14,11 @@ diff -uNr xchat-2.8.4.orig/xchat.desktop xchat-2.8.4/xchat.desktop
 -Comment[ro]=Client de IRC
  Comment[zh_TW]=X-Chat 聊天程式
  Comment=Chat with other people using Internet Relay Chat
- Exec=xchat
+ Exec=sh -c "xchat --existing --url %U || exec xchat"
  Icon=xchat
  Terminal=false
  Type=Application
 -Categories=Network;
 +Categories=GTK;Network;IRCClient;
  StartupNotify=true
+ MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;

diff --git a/xchat.spec b/xchat.spec
index 9ff0da72f66f379cf375dd89a2f8186cb6186b8a..7fd5fc873f0aae9625edc6ddcab08d80d6cca9c0 100644 (file)
--- a/xchat.spec
+++ b/xchat.spec
@@ -21,19 +21,19 @@ Summary(uk.UTF-8):  GTK+ IRC клієнт
 Summary(zh_CN.UTF-8):  GTK+ IRC (聊天) 客户。
 Name:          xchat
 Version:       2.8.8
-Release:       14
+Release:       15
 Epoch:         1
 License:       GPL v2
 Group:         X11/Applications/Networking
 Source0:       http://xchat.org/files/source/2.8/%{name}-%{version}.tar.bz2
 # Source0-md5: 6775c44f38e84d06c06c336b32c4a452
 Source1:       %{name}-pl.po
-Patch0:                %{name}-desktop.patch
+Patch0:                debian.patch
 Patch1:                %{name}-locale_names.patch
 Patch2:                %{name}-long-delimiter.patch
 Patch3:                %{name}-domains.patch
 Patch4:                %{name}-gtk_2_14.patch
-Patch5:                glib.patch
+Patch5:                %{name}-desktop.patch
 URL:           http://www.xchat.org/
 BuildRequires: GConf2-devel
 BuildRequires: autoconf