rpms/gai-pal/devel gai-pal-0.7-xosd-empty-msg.patch, 1.1, 1.2 gai-pal.spec, 1.15, 1.16

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/gai-pal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29116

Modified Files:
	gai-pal-0.7-xosd-empty-msg.patch gai-pal.spec 
Log Message:
* Mon Oct 15 2007 Michael Schwendt <mschwendt[AT]users.sf.net>
- empty stdout of fortune program must not crash xosd either
- clarify licence: GPLv2

* Thu May 24 2007 Michael Schwendt <mschwendt[AT]users.sf.net>
- substitute /lib/ with /%%_lib/ not just for x86_64 (fixes ppc64 build)


gai-pal-0.7-xosd-empty-msg.patch:

Index: gai-pal-0.7-xosd-empty-msg.patch
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal-0.7-xosd-empty-msg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gai-pal-0.7-xosd-empty-msg.patch	27 Feb 2005 05:29:08 -0000	1.1
+++ gai-pal-0.7-xosd-empty-msg.patch	15 Oct 2007 11:08:45 -0000	1.2
@@ -18,3 +18,15 @@
  #ifdef XOSD
      if(display_val == 0)
  	pal_window(msg);
+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	2007-10-15 13:02:16.000000000 +0200
+@@ -132,6 +132,8 @@
+     msg_ptr[0] = 0;
+ 
+     len = strlen(msg);
++    if (!len)
++      return;
+ 
+     for(i=0;i<len;i++){
+ 	if(msg[i] == '\n'){


Index: gai-pal.spec
===================================================================
RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gai-pal.spec	2 Oct 2006 19:39:32 -0000	1.15
+++ gai-pal.spec	15 Oct 2007 11:08:45 -0000	1.16
@@ -9,7 +9,7 @@
 Patch1:		gai-pal-0.7-typo.patch
 Patch2:		gai-pal-0.7-nostrip.patch
 URL:		http://gai.sourceforge.net
-License:	GPL
+License:	GPLv2
 Group:		User Interface/Desktops
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gai-devel >= %{gaiver}
@@ -24,9 +24,8 @@
 %patch -p1 -b .xosd-empty-msg
 %patch1 -p1 -b .typo
 %patch2 -p1 -b .nostrip
-%ifarch x86_64
+# Has an effect on multi-lib platforms.
 sed -i 's!/lib/!/%{_lib}/!' Makefile.in
-%endif
 
 
 %build
@@ -35,7 +34,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall PREFIX=$RPM_BUILD_ROOT/%{_prefix} GNOMEDIR=$RPM_BUILD_ROOT/%{_prefix}
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,7 +47,14 @@
 %{_datadir}/pixmaps/*
 
 %changelog
-* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Mon Oct 15 2007 Michael Schwendt <mschwendt[AT]users.sf.net>
+- empty stdout of fortune program must not crash xosd either
+- clarify licence: GPLv2
+
+* Thu May 24 2007 Michael Schwendt <mschwendt[AT]users.sf.net>
+- substitute /lib/ with /%%_lib/ not just for x86_64 (fixes ppc64 build)
+
+* Mon Oct 02 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7-11
 - rebuilt
 
 * Tue Sep 19 2006 Michael Schwendt <mschwendt[AT]users.sf.net>