From 9038abd41244e7a5410c91c7d950cb1d1f0510b6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 18:51:18 +0000 Subject: [PATCH 1/9] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From b40c758164f4f90a9730857c8fa07a2a08ef0624 Mon Sep 17 00:00:00 2001 From: athimm Date: Sat, 23 Feb 2008 12:28:14 +0000 Subject: [PATCH 2/9] Update to 5.0.4 - Tag/Build will be F-7 only and inherited\! --- .cvsignore | 2 +- sources | 2 +- vtkdata.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c2d31b6..def8a8e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vtkdata-5.0.3.tar.gz +vtkdata-5.0.4.tar.gz diff --git a/sources b/sources index 1f7caa4..be0a5b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4752aa5a363eae72abf3cb5c1f0fe4d9 vtkdata-5.0.3.tar.gz +95dced81c2c16687dc4e571a3d82092c vtkdata-5.0.4.tar.gz diff --git a/vtkdata.spec b/vtkdata.spec index bff399e..d318898 100644 --- a/vtkdata.spec +++ b/vtkdata.spec @@ -1,7 +1,7 @@ Summary: Example data file for VTK Name: vtkdata -Version: 5.0.3 -Release: 6%{?dist} +Version: 5.0.4 +Release: 7 License: BSD-like Group: Development/Libraries URL: http://www.vtk.org/ @@ -36,6 +36,9 @@ rm -rf %{buildroot} %{_datadir}/* %changelog +* Sat Feb 23 2008 Axel Thimm - 5.0.4-7 +- Update to 5.0.4. + * Sun Apr 15 2007 Axel Thimm - 5.0.3-6 - Update to 5.0.3. From 7ac1ef80bc8b5b63e436670d6ba8bd1b9ff5f310 Mon Sep 17 00:00:00 2001 From: athimm Date: Mon, 25 Aug 2008 11:42:02 +0000 Subject: [PATCH 3/9] 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 6c2c6f20bd594011bb2e5bb05c0ba43beaf94b9e Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 5 Oct 2008 09:06:27 +0000 Subject: [PATCH 4/9] 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 624dc08053f0f2108b9fb9b1caf65ffddfcc0c51 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 5 Oct 2008 09:17:46 +0000 Subject: [PATCH 5/9] 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 8f9be4d72d54cb18b71108f3ff7d668d36f84583 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 5 Oct 2008 09:27:27 +0000 Subject: [PATCH 6/9] 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 eb31da4c309702f462776222a997e5d156bbfa48 Mon Sep 17 00:00:00 2001 From: athimm Date: Sun, 5 Oct 2008 09:38:36 +0000 Subject: [PATCH 7/9] 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 46c49f4886d691cd5d8cdba8505b749cb4f9dd79 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:55 +0000 Subject: [PATCH 8/9] 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 5db6d158a9a21b285c69e6e0238983c025931287 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:10:06 +0000 Subject: [PATCH 9/9] 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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8