From 49175d7376fcc3c798bfd81a048a3c44a4ba1915 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:51:02 +0000 Subject: [PATCH 1/5] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 2a2bed783c0fd4e46f94bebec30a715a40763873 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 15 Jul 2010 18:19:07 +0000 Subject: [PATCH 2/5] 7.40 --- alienarena-data.spec | 21 ++++++++++++--------- sources | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/alienarena-data.spec b/alienarena-data.spec index 6d5deec..b06abaf 100644 --- a/alienarena-data.spec +++ b/alienarena-data.spec @@ -1,25 +1,25 @@ Name: alienarena-data -Summary: Data files for Alien Arena 2009 -Version: 20100115 +Summary: Data files for Alien Arena 2010 +Version: 20100715 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-20100115 && cd alienarena-data-20100115 -# svn co svn://svn.icculus.org/alienarena/tags/7.33/arena -# svn co svn://svn.icculus.org/alienarena/tags/7.33/botinfo -# svn co svn://svn.icculus.org/alienarena/tags/7.33/data1 +# mkdir alienarena-data-20100715 && cd alienarena-data-20100715 +# svn co svn://svn.icculus.org/alienarena/tags/7.40/arena +# svn co svn://svn.icculus.org/alienarena/tags/7.40/botinfo +# svn co svn://svn.icculus.org/alienarena/tags/7.40/data1 # cd ../ -# find alienarena-data-20100115 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-data-20100115.tar.bz2 alienarena-data-20100115 +# find alienarena-data-20100715 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-data-20100715.tar.bz2 alienarena-data-20100715 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 2009. +Data files (audio, maps, etc) for Alien Arena 2010. %prep @@ -45,6 +45,9 @@ rm -rf %{buildroot} %{_datadir}/alienarena/ %changelog +* Thu Jul 15 2010 Tom "spot" Callaway 20100715-1 +- update to 20100715 (7.40) + * Fri Jan 15 2010 Tom "spot" Callaway 20100115-1 - update to 20100115 (7.33) diff --git a/sources b/sources index da469d5..4c3d121 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d864d38a6e3a49f2e0767d86807a758 alienarena-data-20100115.tar.bz2 +c578204123b6a5f7ea718936a3bf0625 alienarena-data-20100715.tar.bz2 From d9099a1c72d1094e1a56ee6df45108bb140190df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:42:16 +0000 Subject: [PATCH 3/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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From c7b0c55a22cce499f702c7ce54d99c67968809e0 Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Fri, 17 Dec 2010 11:48:20 -0500 Subject: [PATCH 4/5] 7.50 data --- alienarena-data.spec | 49 ++++++++++++++++++++++---------------------- sources | 2 +- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/alienarena-data.spec b/alienarena-data.spec index b06abaf..03c2b10 100644 --- a/alienarena-data.spec +++ b/alienarena-data.spec @@ -1,50 +1,51 @@ Name: alienarena-data -Summary: Data files for Alien Arena 2010 -Version: 20100715 +Summary: Data files for Alien Arena 2011 +Version: 20101216 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-20100715 && cd alienarena-data-20100715 -# svn co svn://svn.icculus.org/alienarena/tags/7.40/arena -# svn co svn://svn.icculus.org/alienarena/tags/7.40/botinfo -# svn co svn://svn.icculus.org/alienarena/tags/7.40/data1 -# cd ../ -# find alienarena-data-20100715 -depth -name .svn -type d -exec rm -rf {} \; -# tar -cvjf alienarena-data-20100715.tar.bz2 alienarena-data-20100715 -Source0: %{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Subversion: https://svn.icculus.org/alienarena/trunk/?sortby=date +# Upstream seems too inept to provide a simple source only tarball, so we use svn. +# svn export svn://svn.icculus.org/alienarena/tags/7.50/ alienarena-7.50/ +# These windows files are useless to us. +# rm -rf alienarena-7.50/*.exe alienarena-7.50/*.dll alienarena-7.50/Tools/aaradiant.exe +# These bundled zips are also pretty useless. +# rm -rf alienarena-7.50/lib_zipfiles/ +# arena/ botinfo/ data1/ live in the alienarena-data package +# mkdir alienarena-data-20101216 +# mv alienarena-7.50/arena/ alienarena-7.50/botinfo/ alienarena-7.50/data1/ alienarena-data-20101216/ +# rm -f alienarena-data-20101216/{arena,data1}/game.so +# This data tarball is used for the alienarena-data package +# tar -cvJf alienarena-data-20101216.tar.xz alienarena-data-20101216 +# This source tarball is used for the alienarena package +# tar -cvjf alienarena-7.50.tar.bz2 alienarena-7.50 +Source0: %{name}-%{version}.tar.xz BuildArch: noarch - %description -Data files (audio, maps, etc) for Alien Arena 2010. - +Data files (audio, maps, etc) for Alien Arena 2011. %prep %setup -q -rm -f {arena,data1}/game.so - %build - %install -rm -rf %{buildroot} %{__mkdir_p} %{buildroot}/%{_datadir}/alienarena/ cp -ap arena botinfo data1 %{buildroot}/%{_datadir}/alienarena/ - -%clean -rm -rf %{buildroot} - - %files %defattr(-,root,root,-) %{_datadir}/alienarena/ %changelog +* Thu Dec 16 2010 Tom Callaway 20101216-1 +- update to 20101216 (7.50) + +* Mon Aug 2 2010 Tom "spot" Callaway 20100802-1 +- update to 20100802 (7.45) + * Thu Jul 15 2010 Tom "spot" Callaway 20100715-1 - update to 20100715 (7.40) diff --git a/sources b/sources index 4c3d121..65212c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c578204123b6a5f7ea718936a3bf0625 alienarena-data-20100715.tar.bz2 +6a4cc5fc0ffddc846242117473b84e26 alienarena-data-20101216.tar.xz From f5ec5525c2bea6f7c373530856a9f9f02f82feef Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Thu, 24 Mar 2011 12:44:49 -0400 Subject: [PATCH 5/5] update to 7.51 --- alienarena-data.spec | 26 +++++++++++++++++--------- sources | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/alienarena-data.spec b/alienarena-data.spec index 03c2b10..73a80c6 100644 --- a/alienarena-data.spec +++ b/alienarena-data.spec @@ -1,25 +1,27 @@ Name: alienarena-data Summary: Data files for Alien Arena 2011 -Version: 20101216 +Version: 20110323 Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games URL: http://icculus.org/alienarena/ # Subversion: https://svn.icculus.org/alienarena/trunk/?sortby=date # Upstream seems too inept to provide a simple source only tarball, so we use svn. -# svn export svn://svn.icculus.org/alienarena/tags/7.50/ alienarena-7.50/ +# svn export svn://svn.icculus.org/alienarena/tags/7.51/ alienarena-7.51/ # These windows files are useless to us. -# rm -rf alienarena-7.50/*.exe alienarena-7.50/*.dll alienarena-7.50/Tools/aaradiant.exe +# rm -rf alienarena-7.51/*.exe alienarena-7.51/*.dll alienarena-7.51/Tools/aaradiant.exe # These bundled zips are also pretty useless. -# rm -rf alienarena-7.50/lib_zipfiles/ +# rm -rf alienarena-7.51/lib_zipfiles/ +# We don't want the bundled ode code. +# rm -rf alienarena-7.51/source/unix/ode/ # arena/ botinfo/ data1/ live in the alienarena-data package # mkdir alienarena-data-20101216 -# mv alienarena-7.50/arena/ alienarena-7.50/botinfo/ alienarena-7.50/data1/ alienarena-data-20101216/ -# rm -f alienarena-data-20101216/{arena,data1}/game.so -# This data tarball is used for the alienarena-data package -# tar -cvJf alienarena-data-20101216.tar.xz alienarena-data-20101216 +# mv alienarena-7.51/arena/ alienarena-7.51/botinfo/ alienarena-7.51/data1/ alienarena-data-20110323/ +# rm -f alienarena-data-20110323/{arena,data1}/game.so +# This data tarball is used for the alienarena-data package +# tar -cvJf alienarena-data-20110323.tar.xz alienarena-data-20110323 # This source tarball is used for the alienarena package -# tar -cvjf alienarena-7.50.tar.bz2 alienarena-7.50 +# tar -cvjf alienarena-7.51.tar.bz2 alienarena-7.51 Source0: %{name}-%{version}.tar.xz BuildArch: noarch @@ -40,6 +42,12 @@ cp -ap arena botinfo data1 %{buildroot}/%{_datadir}/alienarena/ %{_datadir}/alienarena/ %changelog +* Wed Mar 23 2011 Tom Callaway 20110323-1 +- update to 20110323 (7.51) + +* Mon Feb 07 2011 Fedora Release Engineering - 20101216-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Dec 16 2010 Tom Callaway 20101216-1 - update to 20101216 (7.50) diff --git a/sources b/sources index 65212c4..525fc56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a4cc5fc0ffddc846242117473b84e26 alienarena-data-20101216.tar.xz +a644c100127cbbd31e275929cd6943d8 alienarena-data-20110323.tar.xz