From d4274e5fa6a0340c242dd0a1d969436e8896278b Mon Sep 17 00:00:00 2001 From: Mike McGrath Date: Sat, 28 Oct 2006 15:55:55 +0000 Subject: [PATCH 1/4] Initialize branch FC-6 for wvs-data --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 8bc9d199292cd7e80999c010d0b69ed86c6ab27d Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 28 Oct 2006 16:23:21 +0000 Subject: [PATCH 2/4] - Add %{?dist} tag as buildsys forces this. --- wvs-data.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wvs-data.spec b/wvs-data.spec index 79d5f4f..1700151 100644 --- a/wvs-data.spec +++ b/wvs-data.spec @@ -9,7 +9,7 @@ Name: wvs-data Version: 0.0.%{WVS_date} -Release: 2 +Release: 2%{?dist} Summary: World Vector Shoreline data Group: Applications/Engineering @@ -45,6 +45,9 @@ be used for XTide related applications. %{_datadir}/%{name}/ %changelog +* Sat Oct 28 2006 Mamoru Tasaka +- Add %%{?dist} tag as buildsys forces this. + * Wed Oct 25 2006 Mamoru Tasaka - 0.0.20020219-2 - Directory name change. From 650725e7d00a8cbd5e326f0c2ffa4a186c9663ce Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:19:27 +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 a990023..ee9ebe2 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wvs-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 460dd6a51fdfc534b3e35ee3449a2c44ec66d49e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:28:13 +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 ee9ebe2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wvs-data -# $Id$ -NAME := wvs-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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6