From 485dc59d87d397c83576e69396493626cf25e323 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 00:54:01 +0000 Subject: [PATCH 1/8] Initialize branch F-9 for vtkdata --- 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 6a2d27a816f082e2fe9b9d5f3f9c46c04fba4119 Mon Sep 17 00:00:00 2001 From: athimm Date: Mon, 25 Aug 2008 11:42:02 +0000 Subject: [PATCH 2/8] Fix license tag. --- vtkdata.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/vtkdata.spec b/vtkdata.spec index d318898..2d60f25 100644 --- a/vtkdata.spec +++ b/vtkdata.spec @@ -1,8 +1,13 @@ Summary: Example data file for VTK Name: vtkdata Version: 5.0.4 -Release: 7 -License: BSD-like +Release: 8 +# This is a variant BSD license, a cross between BSD and ZLIB. +# For all intents, it has the same rights and restrictions as BSD. +# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant +# This file tree has no indication of license, but upstream confirms it +# is the same as the vtk code. +License: BSD Group: Development/Libraries URL: http://www.vtk.org/ Source0: http://www.vtk.org/files/release/5.0/%{name}-%{version}.tar.gz @@ -36,6 +41,9 @@ rm -rf %{buildroot} %{_datadir}/* %changelog +* Wed May 21 2008 Tom "spot" Callaway - 5.0.4-8 +- fix license tag + * Sat Feb 23 2008 Axel Thimm - 5.0.4-7 - Update to 5.0.4. From c13e70db1908c2813b2f276631ab678e5f7b6add Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 5 Oct 2008 09:06:27 +0000 Subject: [PATCH 3/8] Update to 5.2.0. --- .cvsignore | 2 +- sources | 2 +- vtkdata.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index def8a8e..1133c76 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vtkdata-5.0.4.tar.gz +vtkdata-5.2.0.tar.gz diff --git a/sources b/sources index be0a5b6..1d129e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95dced81c2c16687dc4e571a3d82092c vtkdata-5.0.4.tar.gz +4da83c829cf38663f9c77b681f29a921 vtkdata-5.2.0.tar.gz diff --git a/vtkdata.spec b/vtkdata.spec index 2d60f25..ebe1dc4 100644 --- a/vtkdata.spec +++ b/vtkdata.spec @@ -1,7 +1,7 @@ Summary: Example data file for VTK Name: vtkdata -Version: 5.0.4 -Release: 8 +Version: 5.2.0 +Release: 9 # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -41,6 +41,9 @@ rm -rf %{buildroot} %{_datadir}/* %changelog +* Sun Oct 5 2008 Axel Thimm - 5.2.0-9 +- Update to 5.2.0. + * Wed May 21 2008 Tom "spot" Callaway - 5.0.4-8 - fix license tag From 1f5c90b0b7ac6168a8872fcb263559144c460724 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 5 Oct 2008 09:17:46 +0000 Subject: [PATCH 4/8] Fix Source URL. --- vtkdata.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtkdata.spec b/vtkdata.spec index ebe1dc4..8907a1d 100644 --- a/vtkdata.spec +++ b/vtkdata.spec @@ -10,7 +10,7 @@ Release: 9 License: BSD Group: Development/Libraries URL: http://www.vtk.org/ -Source0: http://www.vtk.org/files/release/5.0/%{name}-%{version}.tar.gz +Source0: http://www.vtk.org/files/release/5.2/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch From 33e9d4b08ca4910946ac385b8b3bd55ea08a6064 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 5 Oct 2008 09:27:27 +0000 Subject: [PATCH 5/8] Fix Source URL. --- vtkdata.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtkdata.spec b/vtkdata.spec index 8907a1d..af9c776 100644 --- a/vtkdata.spec +++ b/vtkdata.spec @@ -1,7 +1,7 @@ Summary: Example data file for VTK Name: vtkdata Version: 5.2.0 -Release: 9 +Release: 9.1 # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant From 983a4881d96e34c3b8ec09333b9ef3ceccc9e208 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 5 Oct 2008 09:38:36 +0000 Subject: [PATCH 6/8] Bump release again, cvs/koji complain about tagged/untagged 9.1 release (?) --- vtkdata.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtkdata.spec b/vtkdata.spec index af9c776..6e111ef 100644 --- a/vtkdata.spec +++ b/vtkdata.spec @@ -1,7 +1,7 @@ Summary: Example data file for VTK Name: vtkdata Version: 5.2.0 -Release: 9.1 +Release: 10 # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant From 4b6f92a87d45ba5cd0773367f8b7764e94309ef9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:55 +0000 Subject: [PATCH 7/8] 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 b7d4a84..8259819 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := vtkdata 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 9e76656438ed1e58d6be949df257f723e25d43d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:10:12 +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 8259819..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: vtkdata -# $Id$ -NAME := vtkdata -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