rpms/ircp-tray/devel ircp-tray-0.7.4-gtk.patch, NONE, 1.1 ircp-tray-0.7.4-lX11.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ircp-tray.spec, 1.3, 1.4 sources, 1.2, 1.3

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/ircp-tray/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18389

Modified Files:
	.cvsignore ircp-tray.spec sources 
Added Files:
	ircp-tray-0.7.4-gtk.patch ircp-tray-0.7.4-lX11.patch 
Log Message:
* Wed Feb 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.7.4-1
- Fix build
- Update to later upstream release


ircp-tray-0.7.4-gtk.patch:
 eggtrayicon.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ircp-tray-0.7.4-gtk.patch ---
diff -up ircp-tray-0.7.3/src/eggtrayicon.c.gtk ircp-tray-0.7.3/src/eggtrayicon.c
--- ircp-tray-0.7.3/src/eggtrayicon.c.gtk	2010-02-17 21:39:19.848510233 +0100
+++ ircp-tray-0.7.3/src/eggtrayicon.c	2010-02-17 21:39:40.926497313 +0100
@@ -390,7 +390,7 @@ make_transparent_again (GtkWidget *widge
 static void
 make_transparent (GtkWidget *widget, gpointer user_data)
 {
-  if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
+  if (!gtk_widget_get_has_window (widget) || gtk_widget_get_app_paintable (widget))
     return;
 
   gtk_widget_set_app_paintable (widget, TRUE);

ircp-tray-0.7.4-lX11.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ircp-tray-0.7.4-lX11.patch ---
diff -up ircp-tray-0.7.4/src/Makefile.am.lX11 ircp-tray-0.7.4/src/Makefile.am
--- ircp-tray-0.7.4/src/Makefile.am.lX11	2009-02-18 20:44:21.000000000 +0100
+++ ircp-tray-0.7.4/src/Makefile.am	2010-02-17 21:33:12.730493063 +0100
@@ -37,5 +37,5 @@ ircp_tray_SOURCES =         \
 	irda_misc.c	\
 	irda_misc.h
 
-ircp_tray_LDADD = $(GTK_LIBS) $(INTLLIBS) @OPENOBEX_LIBS@ @LIBNOTIFY_LIBS@
+ircp_tray_LDADD = $(GTK_LIBS) $(INTLLIBS) @OPENOBEX_LIBS@ @LIBNOTIFY_LIBS@ -lX11
 
diff -up ircp-tray-0.7.4/src/Makefile.in.lX11 ircp-tray-0.7.4/src/Makefile.in
--- ircp-tray-0.7.4/src/Makefile.in.lX11	2010-02-17 21:34:04.300614053 +0100
+++ ircp-tray-0.7.4/src/Makefile.in	2010-02-17 21:34:15.929508840 +0100
@@ -203,7 +203,7 @@ ircp_tray_SOURCES = \
 	irda_misc.h
 
 
-ircp_tray_LDADD = $(GTK_LIBS) $(INTLLIBS) @OPENOBEX_LIBS@ @LIBNOTIFY_LIBS@
+ircp_tray_LDADD = $(GTK_LIBS) $(INTLLIBS) @OPENOBEX_LIBS@ @LIBNOTIFY_LIBS@ -lX11
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ircp-tray/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	31 Dec 2008 08:30:06 -0000	1.2
+++ .cvsignore	17 Feb 2010 20:43:00 -0000	1.3
@@ -1 +1 @@
-ircp-tray-0.7.3.tar.gz
+ircp-tray-0.7.4.tar.gz


Index: ircp-tray.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ircp-tray/devel/ircp-tray.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ircp-tray.spec	25 Jul 2009 03:36:14 -0000	1.3
+++ ircp-tray.spec	17 Feb 2010 20:43:00 -0000	1.4
@@ -1,12 +1,14 @@
 Name:           ircp-tray
-Version:        0.7.3
-Release:        4%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        Infrared file transfer applet for GNOME panel
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            https://launchpad.net/ircp-tray
 Source0:        http://launchpad.net/ircp-tray/trunk/0.7.3/+download/%{name}-%{version}.tar.gz
+Patch0:         ircp-tray-0.7.4-lX11.patch
+Patch1:         ircp-tray-0.7.4-gtk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  intltool gettext
@@ -14,7 +16,7 @@ BuildRequires:  libnotify-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  openobex-devel
 BuildRequires:  desktop-file-utils
-Requires:       openobex-apps
+BuildRequires:  autoconf automake
 
 %description
 Ircp-Tray is am infrared file transfer program. It stays inside your system
@@ -24,6 +26,8 @@ file out to remote devices via IrDA.
 
 %prep
 %setup -q
+%patch0 -p1 -b .lX11
+%patch1 -p1 -b .gtk
 
 
 %build
@@ -62,6 +66,10 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
+* Wed Feb 17 2010 Lubomir Rintel <lkundrak at v3.sk> - 0.7.4-1
+- Fix build
+- Update to later upstream release
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ircp-tray/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	31 Dec 2008 08:30:06 -0000	1.2
+++ sources	17 Feb 2010 20:43:00 -0000	1.3
@@ -1 +1 @@
-9d9131fba7dfea916f790263ee06f954  ircp-tray-0.7.3.tar.gz
+f5f696194755b7faf976589d89515864  ircp-tray-0.7.4.tar.gz