From 4602e50c92bb166803ff7fa2cd39c548615d5c0b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:47:52 +0000 Subject: [PATCH 1/3] Initialize branch F-13 for PyYAML --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From e328a87a322d2c5669640aac7fe627f1e092587b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 19 May 2010 17:17:02 +0000 Subject: [PATCH 2/3] Fix NVR upgrade issues: greater for f12: PyYAML (jeckersb) f12 = PyYAML-3.09-5.fc12.src f13 = PyYAML-3.09-2.fc13.src --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 45c3595..44a5554 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 2%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 30 2009 John Eckersberg - 3.09-5 +- Rebuild with libyaml-0.1.3 + * Fri Oct 02 2009 John Eckersberg - 3.09-1 - New upstream release 3.09 From d976ea237373d6094693d8c150ddfd996d776a4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:13:56 +0000 Subject: [PATCH 3/3] 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 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) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13