From ea581dab6c457b66d85944bef348a497de5891bc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:41:07 +0000 Subject: [PATCH 1/5] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From f12b2b5d6dfc3233279ba45e12293f913762332b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 20 Feb 2009 18:56:42 +0000 Subject: [PATCH 2/5] Copy over 3.08 from rawhide --- PyYAML.spec | 11 ++++++++--- sources | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 26b86b0..7061b4a 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,7 +1,7 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyYAML -Version: 3.06 +Version: 3.08 Release: 1%{?dist} Summary: YAML parser and emitter for Python @@ -11,7 +11,6 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: python-devel, python-setuptools %description @@ -53,6 +52,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 18 2009 John Eckersberg - 3.08-1 +- New upstream release + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 3.06-2 +- Rebuild for Python 2.6 + * Fri Oct 24 2008 John Eckersberg - 3.06-1 - New upstream release diff --git a/sources b/sources index d97f5d5..b61c036 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 3d3c92528f1547756c9e1d80d7d905c7 PyYAML-3.06.tar.gz +a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz From a44111adb17594fee7c35290196c3c0d352e55e9 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 4 Mar 2009 16:22:23 +0000 Subject: [PATCH 3/5] copy spec over from devel and remove old sources line --- PyYAML.spec | 13 +++++++++++-- sources | 1 - 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7061b4a..f93697b 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.08 -Release: 1%{?dist} +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,7 +11,7 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, python-setuptools +BuildRequires: python-devel, python-setuptools, libyaml-devel %description YAML is a data serialization format designed for human readability and @@ -52,6 +52,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 3 2009 John Eckersberg - 3.08-4 +- Correction, change libyaml to libyaml-devel in BuildRequires + +* Mon Mar 2 2009 John Eckersberg - 3.08-3 +- Add libyaml to BuildRequires + +* Mon Feb 23 2009 Fedora Release Engineering - 3.08-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 18 2009 John Eckersberg - 3.08-1 - New upstream release diff --git a/sources b/sources index b61c036..084d250 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -3d3c92528f1547756c9e1d80d7d905c7 PyYAML-3.06.tar.gz a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz From bafe7b5de074d13d068e7c41a0856569cf68a790 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:20:54 +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 df5dee3..a0a01e5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 $$/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 3d3ddf62921c7d4100fb2f24953581010015a66f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:13:58 +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 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10