From f8d02be638dc86fe833edb2a8b5dded983a3282c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 03:36:36 +0000 Subject: [PATCH 1/5] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From ade3a108e307b037d18718b724b62036ba05b31b Mon Sep 17 00:00:00 2001 From: athimm Date: Fri, 31 Jul 2009 19:10:18 +0000 Subject: [PATCH 2/5] Backpackage 5.4.2 --- .cvsignore | 2 +- sources | 2 +- vtkdata.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1133c76..c46db30 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vtkdata-5.2.0.tar.gz +vtkdata-5.4.2.tar.gz diff --git a/sources b/sources index 1d129e8..81cc7d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4da83c829cf38663f9c77b681f29a921 vtkdata-5.2.0.tar.gz +3b05eadd4446bbf3f863e744b7bee14a vtkdata-5.4.2.tar.gz diff --git a/vtkdata.spec b/vtkdata.spec index 6e111ef..ffd58f1 100644 --- a/vtkdata.spec +++ b/vtkdata.spec @@ -1,7 +1,7 @@ Summary: Example data file for VTK Name: vtkdata -Version: 5.2.0 -Release: 10 +Version: 5.4.2 +Release: 11 # 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,12 @@ rm -rf %{buildroot} %{_datadir}/* %changelog +* Sat Jun 6 2009 Axel Thimm - 5.4.2-11 +- Update to 5.4.2. + +* Wed Mar 11 2009 Orion Poplawski - 5.2.1-10 +- Update to 5.2.1 + * Sun Oct 5 2008 Axel Thimm - 5.2.0-9 - Update to 5.2.0. From c498663fc0989a763cd6a090a783b2badbb9f1cf Mon Sep 17 00:00:00 2001 From: athimm Date: Fri, 31 Jul 2009 19:17:25 +0000 Subject: [PATCH 3/5] Currently rpms cannot be shared between releases. --- vtkdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vtkdata.spec b/vtkdata.spec index ffd58f1..ce6bfa5 100644 --- a/vtkdata.spec +++ b/vtkdata.spec @@ -1,7 +1,7 @@ Summary: Example data file for VTK Name: vtkdata Version: 5.4.2 -Release: 11 +Release: 13%{?dist} # 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 Jul 26 2009 Fedora Release Engineering - 5.4.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sat Jun 6 2009 Axel Thimm - 5.4.2-11 - Update to 5.4.2. From b7ddbe2c8b595a1b1ca9faacecc639f66ae7139d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:53 +0000 Subject: [PATCH 4/5] 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 e9d134ba8557e396d82789335be8dd25941e1a32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:10: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 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10