diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 3e373e4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xqf -# $Id$ -NAME := xqf -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index c5176b7..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xqf-1_0_5-4_fc9:HEAD:xqf-1.0.5-4.fc9.src.rpm:1215516144 diff --git a/xqf-1.0.5-launch.patch b/xqf-1.0.5-launch.patch new file mode 100644 index 0000000..5f7a0c3 --- /dev/null +++ b/xqf-1.0.5-launch.patch @@ -0,0 +1,22 @@ +--- 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'; diff --git a/xqf.spec b/xqf.spec index f804213..09ad28b 100644 --- a/xqf.spec +++ b/xqf.spec @@ -1,18 +1,29 @@ -Name: xqf -Version: 1.0.5 -Release: 6%{?dist} -Summary: A server browser for many popular games +Name: xqf +Version: 1.0.5 +Release: 10%{?dist} +Summary: Server browser for many popular games -Group: Amusements/Games -License: GPLv2+ -URL: http://www.linuxgames.com/xqf/ -Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source1: %{name}.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Group: Amusements/Games +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 >= 2.11 +BuildRequires: GeoIP-devel +BuildRequires: qstat +BuildRequires: gettext +BuildRequires: zlib-devel +BuildRequires: glib +BuildRequires: gtk2-devel +BuildRequires: intltool +BuildRequires: perl-XML-Parser +BuildRequires: desktop-file-utils +BuildRequires: readline-devel +BuildRequires: gdk-pixbuf -Requires: qstat -BuildRequires: GeoIP-devel qstat gdk-pixbuf-devel glib-devel gettext zlib-devel -BuildRequires: gtk2-devel intltool perl-XML-Parser desktop-file-utils readline-devel %description XQF is a game server browser and launcher for Unix/X11 for many popular games @@ -22,70 +33,85 @@ and uses the GTK+ toolkit. %prep %setup -q +%patch0 -p0 %build %configure \ - --enable-geoip \ - --enable-bzip2 \ - --enable-externalrcon \ - --enable-gtk2 + --with-qstat=%{_bindir}/quakestat \ + --enable-geoip \ + --enable-bzip2 \ + --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 \ - %{SOURCE1} +desktop-file-install \ + --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 +install -p -m 0644 pixmaps/%{name}_32x32.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 %{_bindir}/%{name} %{_bindir}/%{name}-rcon %{_datadir}/pixmaps/%{name}_*.png -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/%{name} %{_mandir}/man6/%{name}.6.* %changelog +* Sun Jan 03 2010 Vivek Shah - 1.0.5-10 +- Fix RHBZ #551990 +- Fixed dependency issues + +* Thu Nov 08 2009 Simon Wesp - 1.0.5-9 +- Fix RHBZ #533704 #533705 +- Cosmetical changes + +* Mon Jul 27 2009 Fedora Release Engineering - 1.0.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sun Jun 07 2009 Stefan Posdzich - 1.0.5-7 +- Added new icon cache scriptlets +- Fixed "Bug 503695 - Xqf freezes with 100% CPU" + * Thu Feb 26 2009 Fedora Release Engineering - 1.0.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild