rpms/ekg2/devel ekg2-gtk2-2.13.patch,NONE,1.1 ekg2.spec,1.15,1.16

[Dominik Mierzejewski (rathann)]

Author: rathann

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

Modified Files:
	ekg2.spec 
Added Files:
	ekg2-gtk2-2.13.patch 
Log Message:
* Sat Jul 12 2008 Dominik Mierzejewski <rpm at greysector.net> 0.2-0.3.rc1
- fix compilation with >=gtk-2.13
- add missing defattr


ekg2-gtk2-2.13.patch:

--- NEW FILE ekg2-gtk2-2.13.patch ---
diff -up ekg2-0.2-rc1/plugins/gtk/gtkutil.c.gtk ekg2-0.2-rc1/plugins/gtk/gtkutil.c
--- ekg2-0.2-rc1/plugins/gtk/gtkutil.c.gtk	2008-02-28 21:22:55.000000000 +0100
+++ ekg2-0.2-rc1/plugins/gtk/gtkutil.c	2008-07-12 14:57:55.000000000 +0200
@@ -26,7 +26,6 @@
 #include <fcntl.h>
 
 #include <gtk/gtkbutton.h>
-#include <gtk/gtkclist.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkwindow.h>
diff -up ekg2-0.2-rc1/plugins/gtk/xtext.h.gtk ekg2-0.2-rc1/plugins/gtk/xtext.h
--- ekg2-0.2-rc1/plugins/gtk/xtext.h.gtk	2008-02-28 21:22:55.000000000 +0100
+++ ekg2-0.2-rc1/plugins/gtk/xtext.h	2008-07-12 14:51:49.000000000 +0200
@@ -29,6 +29,9 @@
 #define XTEXT_BG 35
 #define XTEXT_MARKER 36		/* for marker line */
 
+#ifdef GTK_DISABLE_DEPRECATED
+typedef GType            GtkType;
+#endif
 typedef struct _GtkXText GtkXText;
 typedef struct _GtkXTextClass GtkXTextClass;
 


Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ekg2.spec	4 Jun 2008 09:04:49 -0000	1.15
+++ ekg2.spec	12 Jul 2008 13:16:24 -0000	1.16
@@ -5,12 +5,13 @@
 Summary(pl):	Wieloprotokołowy komunikator internetowy
 Name:		ekg2
 Version:	0.2
-Release:	0.2.rc1%{?dist}
+Release:	0.3.rc1%{?dist}
 License:	GPLv2
 Group:		Applications/Internet
 Source0:	http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz
 Patch1:		%{name}-rpm.patch
 Patch2:		%{name}-gcc43.patch
+Patch3:		%{name}-gtk2-2.13.patch
 URL:		http://www.ekg2.org/
 BuildRequires:	aspell-devel
 BuildRequires:	automake17
@@ -196,6 +197,7 @@
 %setup -q -n %{name}-%{version}-rc1
 %patch1 -p1 -b .r
 %patch2 -p1 -b .gcc43
+%patch3 -p1 -b .gtk
 cp -p README README-main
 # convert docs to UTF-8
 for file in \
@@ -318,6 +320,7 @@
 %{_datadir}/%{name}/plugins/jabber
 
 %files ioctld
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/%{name}/ioctld
 %attr(755,root,root) %{_libdir}/%{name}/plugins/ioctld.so
 %{_datadir}/%{name}/plugins/ioctld
@@ -354,6 +357,10 @@
 %attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so
 
 %changelog
+* Sat Jul 12 2008 Dominik Mierzejewski <rpm at greysector.net> 0.2-0.3.rc1
+- fix compilation with >=gtk-2.13
+- add missing defattr
+
 * Wed Jun 04 2008 Dominik Mierzejewski <rpm at greysector.net> 0.2-0.2.rc1
 - fix No UI-PLUGIN problem (patch from upstream)