Author: mschwendt
Update of /cvs/extras/rpms/gai-pal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12972/devel
Modified Files:
gai-pal.spec
Added Files:
gai-pal-0.7-typo.patch gai-pal-0.7-xosd-empty-msg.patch
Log Message:
auto-import gai-pal-0.7-4 on branch devel from gai-pal-0.7-4.src.rpm
gai-pal-0.7-typo.patch:
--- NEW FILE gai-pal-0.7-typo.patch ---
diff -Nur gai-pal-0.7-orig/gai-pal.c gai-pal-0.7/gai-pal.c
--- gai-pal-0.7-orig/gai-pal.c 2004-06-26 12:00:33.000000000 +0200
+++ gai-pal-0.7/gai-pal.c 2005-02-27 06:00:22.000000000 +0100
@@ -62,7 +62,7 @@
{GAI_NOTEBOOK, "General"},
#endif
{GAI_CHECKBUTTON, "Show fortune cookie on start up", &on_start_up,
&on_start_up},
- {GAI_TEXTENTRY,"Fortune program any including command line options:",
&fortune_prg, &fortune_prg},
+ {GAI_TEXTENTRY,"Fortune program including command line options:",
&fortune_prg, &fortune_prg},
{GAI_FRAME, "Choose a friend:"},
{GAI_RADIOBUTTON, nice_names, &pal_val, &pal_val},
{GAI_FRAME_E},
gai-pal-0.7-xosd-empty-msg.patch:
--- NEW FILE gai-pal-0.7-xosd-empty-msg.patch ---
diff -Nur gai-pal-0.7-orig/gai-pal.c gai-pal-0.7/gai-pal.c
--- gai-pal-0.7-orig/gai-pal.c 2004-06-26 12:00:33.000000000 +0200
+++ gai-pal-0.7/gai-pal.c 2005-02-27 05:57:30.000000000 +0100
@@ -198,9 +198,14 @@
void pal_click(int x, int y, gpointer d)
{
char *msg;
+ const char errorMsg[] = "Fortune program not found!\n";
+ GError *err = NULL;
- g_spawn_command_line_sync (fortune_prg, &msg, NULL, NULL, NULL);
-
+ if ( !g_spawn_command_line_sync (fortune_prg, &msg, NULL, NULL, &err) )
+ {
+ g_error_free( err );
+ msg = g_strdup( errorMsg );
+ }
#ifdef XOSD
if(display_val == 0)
pal_window(msg);
Index: gai-pal.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gai-pal.spec 26 Feb 2005 18:48:07 -0000 1.5
+++ gai-pal.spec 27 Feb 2005 05:29:08 -0000 1.6
@@ -1,26 +1,28 @@
-%define name gai-pal
-%define version 0.7
-%define release 1
%define gaiver 0:0.5.8
Summary: GAI Pal applet
-Name: %{name}
-Version: %{version}
-Release: %{release}.3
+Name: gai-pal
+Version: 0.7
+Release: 4
Epoch: 0
Source0: %{name}-%{version}.tar.bz2
+Patch0: gai-pal-0.7-xosd-empty-msg.patch
+Patch1: gai-pal-0.7-typo.patch
URL:
http://gai.sourceforge.net
License: GPL
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gai-devel >= %{gaiver}
+BuildRequires: xosd-devel
%description
A GAI applet, providing a friend that always has something wise
-or funny to say
+or funny to say.
%prep
%setup -q
+%patch -p1 -b .xosd-empty-msg
+%patch1 -p1 -b .typo
%ifarch x86_64
sed -i 's!/lib/!/%{_lib}/!' Makefile.in
%endif
@@ -44,6 +46,12 @@
%{_datadir}/pixmaps/*
%changelog
+* Sun Feb 27 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7-4
+- BR xosd-devel
+- fix xosd crash if fortune program missing or message is empty
+- fix message in fortune preferences window
+- drop confusing usage of macros in NVR (fixes release tag!)
+
* Sat Feb 26 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-3
- a "sed -i 's!/lib/!/%%{_lib}/!' Makefile.in" fixes x86_64