From 4b2986232f88be495320835316120a827e11eae3 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Mon, 21 May 2007 17:29:03 +0000 Subject: [PATCH 1/5] Initialize branch F-7 for rott --- 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 941b0cfaa2eca50b3acd89720677894939beb72e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 21 May 2007 21:33:07 +0000 Subject: [PATCH 2/5] - Make this 1.0-2.fc7.1 as the cvs-import.sh script tagged the fc8 version with an fc7 tag --- rott.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rott.spec b/rott.spec index 980368b..2f5a479 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.0 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Rise of the Triad Group: Amusements/Games License: GPL @@ -153,6 +153,10 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog +* Mon May 21 2007 Hans de Goede 1.4-2.fc7.1 +- Make this 1.0-2.fc7.1 as the cvs-import.sh script tagged the fc8 + version with an fc7 tag + * Fri May 11 2007 Hans de Goede 1.0-2 - Add desktop entry and userfriendly launcher script for registered package - Add a patch fixing crashes with "long" usernames From 6391a380bee4d1a2e8b31898e87db7e3e3f51dea Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 21 May 2007 22:15:06 +0000 Subject: [PATCH 3/5] - Add missing autodownloader Requires to rott-shareware --- rott.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rott.spec b/rott.spec index 2f5a479..5f937db 100644 --- a/rott.spec +++ b/rott.spec @@ -1,6 +1,6 @@ Name: rott Version: 1.0 -Release: 2%{?dist}.1 +Release: 3%{?dist} Summary: Rise of the Triad Group: Amusements/Games License: GPL @@ -36,7 +36,7 @@ enhanced with the "high" resolution rendering from the winrott port. %package shareware Summary: Rise of the Triad shareware version Group: Amusements/Games -Requires: hicolor-icon-theme +Requires: hicolor-icon-theme autodownloader %description shareware This is the icculus.org Linux port of Apogee's classic 3d shooter Rise of the @@ -153,9 +153,8 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog -* Mon May 21 2007 Hans de Goede 1.4-2.fc7.1 -- Make this 1.0-2.fc7.1 as the cvs-import.sh script tagged the fc8 - version with an fc7 tag +* Fri May 11 2007 Hans de Goede 1.0-3 +- Add missing autodownloader Requires to rott-shareware * Fri May 11 2007 Hans de Goede 1.0-2 - Add desktop entry and userfriendly launcher script for registered package From c650708d58c27904b3db503630eeb5131ad6feff Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:28:52 +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 31a7a71..bed0b7d 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: rott -# $Id$ +# $Id: Makefile,v 1.1 2007/05/17 20:57:17 wtogami Exp $ NAME := rott 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 b02c4b5e8104d64aafc0b90ddc62b87cb791a1ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:34:10 +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 bed0b7d..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: rott -# $Id: Makefile,v 1.1 2007/05/17 20:57:17 wtogami Exp $ -NAME := rott -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