From 9ac4de5fda6742a600d08fce1cd9a7636fff94fa Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:25:41 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for xqf --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 882289dd3b07d0af80aa458ceee715cf8967b9fd Mon Sep 17 00:00:00 2001 From: cassmodiah Date: Sat, 14 Nov 2009 12:21:05 +0000 Subject: [PATCH 2/5] - Fix RHBZ #533704 #533705 - Cosmetical changes --- xqf.spec | 68 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/xqf.spec b/xqf.spec index c177473..6511fa0 100644 --- a/xqf.spec +++ b/xqf.spec @@ -1,19 +1,29 @@ -Name: xqf -Version: 1.0.5 -Release: 8%{?dist} -Summary: A server browser for many popular games +Name: xqf +Version: 1.0.5 +Release: 9%{?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 -Patch0: %{name}-%{version}-launch.patch -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-9 +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 @@ -23,15 +33,16 @@ and uses the GTK+ toolkit. %prep %setup -q -%patch0 -p0 -b .launch +%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} CFLAGS="%{optflags}" @@ -40,19 +51,16 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" rm -rf %{buildroot} make install DESTDIR=%{buildroot} -# removing extraneous .desktop file rm -f %{buildroot}%{_datadir}/applications/%{name}.desktop -# the desktop file -desktop-file-install --vendor="fedora" \ - --dir=%{buildroot}%{_datadir}/applications \ - %{SOURCE1} +desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applications \ + %{SOURCE1} -# the icon stuff mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps -install -p -m 0644 pixmaps/%{name}_32x32.png \ - %{buildroot}%{_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} @@ -82,13 +90,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_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 +* 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 From 87a5ee1b4ae2a9fdedc36b46f204f2cdfa9a75f9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:53 +0000 Subject: [PATCH 3/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3e373e4..25003c4 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xqf -# $Id$ +# $Id: Makefile,v 1.1 2008/07/07 18:57:08 kevin Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From baf93e1515e338a044a2415e9baa335b74f8aef7 Mon Sep 17 00:00:00 2001 From: Vivek Shah Date: Sun, 3 Jan 2010 15:12:29 +0000 Subject: [PATCH 4/5] Fixed dependency issues #551990 --- xqf.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xqf.spec b/xqf.spec index 6511fa0..09ad28b 100644 --- a/xqf.spec +++ b/xqf.spec @@ -1,6 +1,6 @@ Name: xqf Version: 1.0.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Server browser for many popular games Group: Amusements/Games @@ -11,7 +11,7 @@ Source1: %{name}.desktop Patch0: %{name}-%{version}-launch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: qstat >= 2.11-9 +Requires: qstat >= 2.11 BuildRequires: GeoIP-devel BuildRequires: qstat BuildRequires: gettext @@ -97,6 +97,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %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 From df76888297dc29de821aa9ad23ff64c8bf02a630 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:11:00 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 25003c4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xqf -# $Id: Makefile,v 1.1 2008/07/07 18:57:08 kevin Exp $ -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 $$d/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/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 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