From 3481d0c30c857e49e089d019df22a5782189b2bb Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 28 Nov 2007 15:31:42 +0000 Subject: [PATCH 1/4] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 49c36d21c8a2f5ac9238d68e183db00bd6cf0795 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 28 Nov 2007 15:48:40 +0000 Subject: [PATCH 2/4] branching --- alienarena-data.spec | 57 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 2 files changed, 58 insertions(+) create mode 100644 alienarena-data.spec diff --git a/alienarena-data.spec b/alienarena-data.spec new file mode 100644 index 0000000..539c1c0 --- /dev/null +++ b/alienarena-data.spec @@ -0,0 +1,57 @@ +Name: alienarena-data +Summary: Data files for Alien Arena 2007 +Version: 20071011 +Release: 2%{?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/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: alienarena >= 6.10 + +%description +Data files (audio, maps, etc) for Alien Arena 2007. + +%prep +%setup -q -n alienarena2007 + +%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 -rf $RPM_BUILD_ROOT%{_datadir}/alienarena/Tools/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%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) +%{_datadir}/alienarena/ +%{_datadir}/icons/hicolor/32x32/apps/aa.png + +%changelog +* Tue Nov 27 2007 Tom "spot" Callaway 20071011-2 +- cleanups, move icon into hicolor tree + +* Thu Nov 1 2007 Tom "spot" Callaway 20071011-1 +- Initial package for Fedora diff --git a/sources b/sources index e69de29..1b52493 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +fda681b0a121f904e7079adc4b7222f7 alienarena2007-20071011-data.tar.bz2 From 1ccb52fc1e304b2659607602efe76c9eca40a6b3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:26:12 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9262966..552ab7b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 f5e6d1784ddaf96580291be5bcbc5fed899bd995 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:42:15 +0000 Subject: [PATCH 4/4] 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 552ab7b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: alienarena-data -# $Id$ -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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7