From 24544973e06ce7786841bfc46e0ea38b07ada042 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 00:28:58 +0000 Subject: [PATCH 1/4] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 45c3595..7a60da3 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Wed Jul 21 2010 David Malcolm - 3.09-3 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Fri Oct 02 2009 John Eckersberg - 3.09-1 - New upstream release 3.09 From 9c0bf5e8e65be00e7664d73d465bc0a78445f7e2 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 27 Jul 2010 09:38:37 +0000 Subject: [PATCH 2/4] - Bump release number for upgrade path --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7a60da3..51730a2 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 3%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Tue Jul 27 2010 Mamoru Tasaka - 3.09-5 +- Bump release number for upgrade path + * Wed Jul 21 2010 David Malcolm - 3.09-3 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From b2d86cc5084d8216eeb4cf714d8955dec44f1582 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 27 Jul 2010 09:43:33 +0000 Subject: [PATCH 3/4] Oops... build target wrong --- PyYAML.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 51730a2..c9dacea 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,7 +53,7 @@ rm -rf %{buildroot} %changelog -* Tue Jul 27 2010 Mamoru Tasaka - 3.09-5 +* Tue Jul 27 2010 Mamoru Tasaka - 3.09-6 - Bump release number for upgrade path * Wed Jul 21 2010 David Malcolm - 3.09-3 From bd4200327e53d8fae0fa5495acea7ce0e4d7ea69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:14:01 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 a0a01e5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: PyYAML -# $Id$ -NAME := PyYAML -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)