- added xchat-gnome-makefile.patch - wrong chars in Makefile

- added xchat-gnome-notify.patch for changes in function notify_notification_new
- up to 0.26.1

diff --git a/xchat-gnome-makefile.patch b/xchat-gnome-makefile.patch
new file mode 100644 (file)
index 0000000..b59a2ad
--- /dev/null
+++ b/xchat-gnome-makefile.patch
@@ -0,0 +1,19 @@
+--- xchat-gnome-0.26.1.orig/src/common/dbus/Makefile.am
++++ xchat-gnome-0.26.1/src/common/dbus/Makefile.am
+@@ -48,11 +48,11 @@ schema_DATA = $(schema_in_files:.schemas
+ 
+ install-data-local: $(schema_DATA)
+ if GCONF_SCHEMAS_INSTALL
+-        if test -z "$(DESTDIR)" ; then \
+-              for p in $^ ; do \
+-              GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p >&1 > /dev/null; \
+-              done \
+-        fi
++      if test -z "$(DESTDIR)" ; then \
++              for p in $^ ; do \
++              GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p >&1 > /dev/null; \
++              done \
++      fi
+ endif
+ 
+ EXTRA_DIST =                          \

diff --git a/xchat-gnome-notify.patch b/xchat-gnome-notify.patch
new file mode 100644 (file)
index 0000000..7197339
--- /dev/null
+++ b/xchat-gnome-notify.patch
@@ -0,0 +1,11 @@
+--- xchat-gnome-0.26.1/plugins/notify-osd/notify-osd.c~        2008-09-07 15:18:27.000000000 +0200
++++ xchat-gnome-0.26.1/plugins/notify-osd/notify-osd.c 2013-04-14 14:36:40.000000000 +0200
+@@ -67,7 +67,7 @@
+       gchar *escaped;
+ 
+       escaped = g_markup_escape_text (message, strlen(message));
+-      notify = notify_notification_new (summary, escaped, NULL, NULL);
++      notify = notify_notification_new (summary, escaped, NULL);
+       notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+       notify_notification_set_icon_from_pixbuf (notify, notify_icon);
+       if (!notify_notification_show (notify, &error)) {

diff --git a/xchat-gnome.spec b/xchat-gnome.spec
index e4676de34f84356550c2b1eb1828ef813807433e..acfa7c39deee21e02bcadd39e8cdc938d54e0742 100644 (file)
--- a/xchat-gnome.spec
+++ b/xchat-gnome.spec
@@ -3,13 +3,15 @@ Summary(de.UTF-8):    IRC-Client (Chat) mit grafischer Oberfläche
 Summary(fr.UTF-8):     Client IRC (chat) avec interface graphique
 Summary(pl.UTF-8):     Graficzny klient IRC (chat)
 Name:          xchat-gnome
-Version:       0.26.0
-Release:       4
+Version:       0.26.1
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Networking
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/xchat-gnome/0.26/%{name}-%{version}.tar.bz2
-# Source0-md5: ef230db0d104faa8dc7e5060c51f7261
+# Source0-md5: c9ce3d6e549736edfc1a1dc0282fb363
 Patch0:                %{name}-long-delimiter.patch
+Patch1:                %{name}-notify.patch
+Patch2:                %{name}-makefile.patch
 URL:           http://xchat-gnome.navi.cx/
 BuildRequires: GConf2-devel >= 2.24.0
 BuildRequires: autoconf >= 2.60
@@ -79,6 +81,8 @@ Wtyczka dodająca do XChata możliwość uruchamiania skryptów w Pythonie.
 %prep
 %setup -q
 %patch0 -p1
+%patch1        -p1
+%patch2        -p1
 
 %build
 %{__libtoolize}