From cc157f66243c76f1a64d02d2c0fb7a1b172325a2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 12:03:20 +0000 Subject: [PATCH 1/8] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 57e892156e942b529fafc9cd7d50256d22d2fe49 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 2 Jul 2008 19:07:09 +0000 Subject: [PATCH 2/8] update to 2008 data --- alienarena-data.spec | 24 +++++++++++++----------- sources | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/alienarena-data.spec b/alienarena-data.spec index 539c1c0..4aef3bd 100644 --- a/alienarena-data.spec +++ b/alienarena-data.spec @@ -1,22 +1,22 @@ Name: alienarena-data -Summary: Data files for Alien Arena 2007 -Version: 20071011 -Release: 2%{?dist} +Summary: Data files for Alien Arena 2008 +Version: 20080603 +Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games -# Upstream has prebuilt binaries in it. We pull those out and bzip2. -# Source0: http://icculus.org/alienarena/files/alienarena2007-20071011-linux.zip -Source0: alienarena2007-20071011-data.tar.bz2 -URL: http://icculus.org/alienarena/files/ +# Upstream has prebuilt binaries and source code in it. We pull those out and bzip2. +# Source0: http://icculus.org/alienarena/Files/alienarena2008-linux20080603.zip +Source0: alienarena2008-20080603-data.tar.bz2 +URL: http://icculus.org/alienarena/Files/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: alienarena >= 6.10 +Requires: alienarena >= 7.10 %description -Data files (audio, maps, etc) for Alien Arena 2007. +Data files (audio, maps, etc) for Alien Arena 2008. %prep -%setup -q -n alienarena2007 +%setup -q -n alienarena2008 %build @@ -27,7 +27,6 @@ cp -ap * $RPM_BUILD_ROOT%{_datadir}/alienarena/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ mv $RPM_BUILD_ROOT%{_datadir}/alienarena/aa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/Aa.ico -rm -rf $RPM_BUILD_ROOT%{_datadir}/alienarena/Tools/ %clean rm -rf $RPM_BUILD_ROOT @@ -50,6 +49,9 @@ fi %{_datadir}/icons/hicolor/32x32/apps/aa.png %changelog +* Wed Jul 2 2008 Tom "spot" Callaway 20080603-1 +- update to 2008 data + * Tue Nov 27 2007 Tom "spot" Callaway 20071011-2 - cleanups, move icon into hicolor tree diff --git a/sources b/sources index 1b52493..5bf5559 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fda681b0a121f904e7079adc4b7222f7 alienarena2007-20071011-data.tar.bz2 +853715cb9de1f727b8e10524d207eead alienarena2008-20080603-data.tar.bz2 From 22c494cd7fcb46ec2f2967a2dcbc8a1e99a55156 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 3 Jul 2008 12:50:32 +0000 Subject: [PATCH 3/8] get rid of prebuilt binary file --- alienarena-data.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/alienarena-data.spec b/alienarena-data.spec index 4aef3bd..ec03e04 100644 --- a/alienarena-data.spec +++ b/alienarena-data.spec @@ -27,6 +27,7 @@ cp -ap * $RPM_BUILD_ROOT%{_datadir}/alienarena/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ mv $RPM_BUILD_ROOT%{_datadir}/alienarena/aa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/Aa.ico +rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/arena/game.so %clean rm -rf $RPM_BUILD_ROOT @@ -49,6 +50,9 @@ fi %{_datadir}/icons/hicolor/32x32/apps/aa.png %changelog +* Thu Jul 3 2008 Tom "spot" Callaway 20080603-2 +- get rid of prebuilt so file + * Wed Jul 2 2008 Tom "spot" Callaway 20080603-1 - update to 2008 data From 7aed06a15930097e25b62d440914fd92a38a65de Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 3 Jul 2008 12:56:32 +0000 Subject: [PATCH 4/8] bump rel --- alienarena-data.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alienarena-data.spec b/alienarena-data.spec index ec03e04..cf126e6 100644 --- a/alienarena-data.spec +++ b/alienarena-data.spec @@ -1,7 +1,7 @@ Name: alienarena-data Summary: Data files for Alien Arena 2008 Version: 20080603 -Release: 1%{?dist} +Release: 2%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games # Upstream has prebuilt binaries and source code in it. We pull those out and bzip2. From f073a35aa86297acb0446b939d7ff27726fb22ea Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 20 Oct 2008 18:34:51 +0000 Subject: [PATCH 5/8] update for 7.20 --- alienarena-data.spec | 57 ++++++++++++++++++++++---------------------- sources | 2 +- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/alienarena-data.spec b/alienarena-data.spec index cf126e6..d91403e 100644 --- a/alienarena-data.spec +++ b/alienarena-data.spec @@ -1,55 +1,54 @@ Name: alienarena-data Summary: Data files for Alien Arena 2008 -Version: 20080603 -Release: 2%{?dist} +Version: 20081016 +Release: 1%{?dist} License: Redistributable, no modification permitted Group: Amusements/Games -# Upstream has prebuilt binaries and source code in it. We pull those out and bzip2. -# Source0: http://icculus.org/alienarena/Files/alienarena2008-linux20080603.zip -Source0: alienarena2008-20080603-data.tar.bz2 -URL: http://icculus.org/alienarena/Files/ +URL: http://icculus.org/alienarena/ +# We need to get this from SVN +# mkdir alienarena-data-20081016 && cd alienarena-data-20081016 +# svn co svn://svn.icculus.org/alienarena/tags/7.20/arena +# svn co svn://svn.icculus.org/alienarena/tags/7.20/botinfo +# svn co svn://svn.icculus.org/alienarena/tags/7.20/data1 +# cd ../ +# tar -cvjf alienarena-data-20081016.tar.bz2 alienarena-data-20081016 +Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: alienarena >= 7.10 + %description Data files (audio, maps, etc) for Alien Arena 2008. + %prep -%setup -q -n alienarena2008 +%setup -q +find -name "\.svn" -type d -print0 | xargs -0 rm -rf +rm -f {arena,data1}/game.so + %build + %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/alienarena/ -cp -ap * $RPM_BUILD_ROOT%{_datadir}/alienarena/ -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ -mv $RPM_BUILD_ROOT%{_datadir}/alienarena/aa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/ -rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/Aa.ico -rm -f $RPM_BUILD_ROOT%{_datadir}/alienarena/arena/game.so +rm -rf %{buildroot} +%{__mkdir_p} %{buildroot}/%{_datadir}/alienarena/ +cp -ap arena botinfo data1 %{buildroot}/%{_datadir}/alienarena/ + %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 - -%postun -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi %files -%defattr(-,root,root) +%defattr(-,root,root,-) %{_datadir}/alienarena/ -%{_datadir}/icons/hicolor/32x32/apps/aa.png %changelog +* Mon Oct 20 2008 Tom "spot" Callaway 20081016-1 +- update to 20081016 +- sync up with Paul Bredbury's spec + * Thu Jul 3 2008 Tom "spot" Callaway 20080603-2 - get rid of prebuilt so file diff --git a/sources b/sources index 5bf5559..d2db02e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -853715cb9de1f727b8e10524d207eead alienarena2008-20080603-data.tar.bz2 +300e44b08a54f72587f4144008a61868 alienarena-data-20081016.tar.bz2 From d20ee6f0ea0f6b4f5e10d38e889f622e8aca2660 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Sat, 31 Jan 2009 01:43:13 +0000 Subject: [PATCH 6/8] update to 20090115 for 7.21 --- alienarena-data.spec | 17 ++++++++++------- sources | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/alienarena-data.spec b/alienarena-data.spec index d91403e..2c19b9b 100644 --- a/alienarena-data.spec +++ b/alienarena-data.spec @@ -1,17 +1,18 @@ Name: alienarena-data Summary: Data files for Alien Arena 2008 -Version: 20081016 +Version: 20090115 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-20081016 && cd alienarena-data-20081016 -# svn co svn://svn.icculus.org/alienarena/tags/7.20/arena -# svn co svn://svn.icculus.org/alienarena/tags/7.20/botinfo -# svn co svn://svn.icculus.org/alienarena/tags/7.20/data1 +# 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 # cd ../ -# tar -cvjf alienarena-data-20081016.tar.bz2 alienarena-data-20081016 +# find alienarena-20090115 -depth -name .svn -type d -exec rm -rf {} \; +# tar -cvjf alienarena-data-20090115.tar.bz2 alienarena-data-20090115 Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -23,7 +24,6 @@ Data files (audio, maps, etc) for Alien Arena 2008. %prep %setup -q -find -name "\.svn" -type d -print0 | xargs -0 rm -rf rm -f {arena,data1}/game.so @@ -45,6 +45,9 @@ rm -rf %{buildroot} %{_datadir}/alienarena/ %changelog +* Fri Jan 30 2009 Tom "spot" Callaway 20090115-1 +- update to 20090115 (7.21) + * Mon Oct 20 2008 Tom "spot" Callaway 20081016-1 - update to 20081016 - sync up with Paul Bredbury's spec diff --git a/sources b/sources index d2db02e..bb6a855 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -300e44b08a54f72587f4144008a61868 alienarena-data-20081016.tar.bz2 +85fcf79affa2ac14a7d1983cf02990fd alienarena-data-20090115.tar.bz2 From a714ab1e552f57ea4d24711bd6d960e2ec7cf9ff Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:12 +0000 Subject: [PATCH 7/8] 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 9a9fc82a441522bd968b58e9c078ecc570d3570b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:42:18 +0000 Subject: [PATCH 8/8] 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9