rpms/xqf/F-11 xqf-1.0.5-launch.patch,NONE,1.1 xqf.spec,1.3,1.4

[Stefan Posdzich]

Author: cheekyboinc

Update of /cvs/pkgs/rpms/xqf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10844

Modified Files:
	xqf.spec 
Added Files:
	xqf-1.0.5-launch.patch 
Log Message:
- Added new icon cache scriptlets
- Fixed "Bug 503695 - Xqf freezes with 100% CPU"


xqf-1.0.5-launch.patch:

--- NEW FILE xqf-1.0.5-launch.patch ---
--- src/launch.c	2005-10-07 14:55:15.000000000 +0200
+++ src/launch.c.patch	2009-06-05 16:30:01.000000000 +0200
@@ -168,14 +168,18 @@
 
   res = read (fd, cl->buffer + cl->pos, CLIENT_ERROR_BUFFER - 1 - cl->pos);
 
-  if (res <= 0) {	/* read error or EOF */
+  if (res < 0) {	/* read error or EOF */
     if (errno == EAGAIN || errno == EWOULDBLOCK)
       return;
 
     client_detach (cl);
     return;
+  } else if (res == 0) {
+    client_detach (cl);
+    return;
   }
 
+
   if (cl->pos + res == CLIENT_ERROR_BUFFER - 1) {
     tmp = &cl->buffer[CLIENT_ERROR_BUFFER - 1];
     *tmp = '\0';


Index: xqf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqf/F-11/xqf.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xqf.spec	26 Feb 2009 11:56:22 -0000	1.3
+++ xqf.spec	7 Jun 2009 14:36:16 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xqf
 Version:	1.0.5
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	A server browser for many popular games
 
 Group:		Amusements/Games
@@ -8,6 +8,7 @@ License:	GPLv2+
 URL:		http://www.linuxgames.com/xqf/
 Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
+Patch0:		%{name}-%{version}-launch.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	qstat
@@ -22,6 +23,7 @@ and uses the GTK+ toolkit.
 
 %prep
 %setup -q
+%patch0 -p0 -b .launch
 
 
 %build
@@ -31,48 +33,49 @@ and uses the GTK+ toolkit.
 	--enable-externalrcon	\
 	--enable-gtk2
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 # removing extraneous .desktop file
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+rm -f %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 # the desktop file
 desktop-file-install --vendor="fedora"				\
-	--dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
+	--dir=%{buildroot}%{_datadir}/applications		\
 	%{SOURCE1}
 
 # the icon stuff
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
 
 install -p -m 0644 pixmaps/%{name}_32x32.png	\
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+	%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 %find_lang %{name}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -86,6 +89,10 @@ fi
 
 
 %changelog
+* Sun Jun 07 2009 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 1.0.5-7
+- Added new icon cache scriptlets
+- Fixed "Bug 503695 - Xqf freezes with 100% CPU"
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild