From e7b4e808fe133409058e6756ef9eee9ec3ef73a1 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:59:43 +0000 Subject: [PATCH 1/5] Initialize branch F-11 for alienarena-data --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 46051c338b890fbea5c14c3e21fe33abf52fccbb Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 31 Jul 2009 16:26:14 +0000 Subject: [PATCH 2/5] update data to 7.30 --- alienarena-data.spec | 26 ++++++++++++++++---------- sources | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/alienarena-data.spec b/alienarena-data.spec index f18e463..d9f516f 100644 --- a/alienarena-data.spec +++ b/alienarena-data.spec @@ -1,25 +1,25 @@ Name: alienarena-data -Summary: Data files for Alien Arena 2008 -Version: 20090115 -Release: 2%{?dist} +Summary: Data files for Alien Arena 2009 +Version: 20090730 +Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games URL: http://icculus.org/alienarena/ # We need to get this from SVN -# mkdir alienarena-data-20090115 && cd alienarena-data-20090115 -# svn co svn://svn.icculus.org/alienarena/tags/7.21/arena -# svn co svn://svn.icculus.org/alienarena/tags/7.21/botinfo -# svn co svn://svn.icculus.org/alienarena/tags/7.21/data1 +# mkdir alienarena-data-20090730 && cd alienarena-data-20090730 +# svn co svn://svn.icculus.org/alienarena/tags/7.30/arena +# svn co svn://svn.icculus.org/alienarena/tags/7.30/botinfo +# svn co svn://svn.icculus.org/alienarena/tags/7.30/data1 # cd ../ -# find alienarena-20090115 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-data-20090115.tar.bz2 alienarena-data-20090115 +# find alienarena-data-20090730 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-data-20090730.tar.bz2 alienarena-data-20090730 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description -Data files (audio, maps, etc) for Alien Arena 2008. +Data files (audio, maps, etc) for Alien Arena 2009. %prep @@ -45,6 +45,12 @@ rm -rf %{buildroot} %{_datadir}/alienarena/ %changelog +* Thu Jul 30 2009 Tom "spot" Callaway 20090730-1 +- update to 20090730 (7.30) + +* Fri Jul 24 2009 Fedora Release Engineering - 20090115-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 20090115-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index bb6a855..8132d48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85fcf79affa2ac14a7d1983cf02990fd alienarena-data-20090115.tar.bz2 +db441b9856f8fb51eac472232f54e0ad alienarena-data-20090730.tar.bz2 From 906ad098f480136a3d52655fa5436363984f3ad2 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 3 Nov 2009 03:08:47 +0000 Subject: [PATCH 3/5] update to 7.32 --- alienarena-data.spec | 17 ++++++++++------- sources | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/alienarena-data.spec b/alienarena-data.spec index d9f516f..494f1ac 100644 --- a/alienarena-data.spec +++ b/alienarena-data.spec @@ -1,18 +1,18 @@ Name: alienarena-data Summary: Data files for Alien Arena 2009 -Version: 20090730 +Version: 20091102 Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games URL: http://icculus.org/alienarena/ # We need to get this from SVN -# mkdir alienarena-data-20090730 && cd alienarena-data-20090730 -# svn co svn://svn.icculus.org/alienarena/tags/7.30/arena -# svn co svn://svn.icculus.org/alienarena/tags/7.30/botinfo -# svn co svn://svn.icculus.org/alienarena/tags/7.30/data1 +# mkdir alienarena-data-20091102 && cd alienarena-data-20091102 +# svn co svn://svn.icculus.org/alienarena/tags/7.32/arena +# svn co svn://svn.icculus.org/alienarena/tags/7.32/botinfo +# svn co svn://svn.icculus.org/alienarena/tags/7.32/data1 # cd ../ -# find alienarena-data-20090730 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-data-20090730.tar.bz2 alienarena-data-20090730 +# find alienarena-data-20091102 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-data-20091102.tar.bz2 alienarena-data-20091102 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -45,6 +45,9 @@ rm -rf %{buildroot} %{_datadir}/alienarena/ %changelog +* Mon Nov 2 2009 Tom "spot" Callaway 20091102-1 +- update to 20091102 (7.32) + * Thu Jul 30 2009 Tom "spot" Callaway 20090730-1 - update to 20090730 (7.30) diff --git a/sources b/sources index 8132d48..8493abe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db441b9856f8fb51eac472232f54e0ad alienarena-data-20090730.tar.bz2 +979225387d1dce5cd900e21b402dc88c alienarena-data-20091102.tar.bz2 From ced40f807d708fd515fa4c55af9a60387d5cbde0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:12 +0000 Subject: [PATCH 4/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 9262966..1db8582 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: alienarena-data -# $Id$ +# $Id: Makefile,v 1.1 2007/11/28 15:31:33 spot Exp $ NAME := alienarena-data 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 85b2b71252bca22936d4b0fdf0de4c0f172c68de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:42:19 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 1db8582..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alienarena-data -# $Id: Makefile,v 1.1 2007/11/28 15:31:33 spot Exp $ -NAME := alienarena-data -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11