From d80b82e4e511b7f6628511cbc2905c811458a3e1 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 18:30:39 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 for python-lxml --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 205af45f76ba079b3084e23b08e455d1f5597891 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 24 Jan 2007 15:39:34 +0000 Subject: [PATCH 2/5] Update to 1.1.2 --- .cvsignore | 2 +- python-lxml.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index bfb4724..f130c7d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxml-1.0.3.tgz +lxml-1.1.2.tgz diff --git a/python-lxml.spec b/python-lxml.spec index 5d6d1d9..acb928e 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -4,8 +4,8 @@ %define srcname lxml Name: python-%{srcname} -Version: 1.0.3 -Release: 2%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt Group: Development/Libraries @@ -31,6 +31,7 @@ and handles memory management automatically, unlike the default bindings. %prep %setup -q -n %{srcname}-%{version} +chmod a-x doc/rest2html.py %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build @@ -56,6 +57,12 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/lxml/*.pyo %changelog +* Fri Jan 19 2007 Jeffrey C. Ollie - 1.1.2-1 +- Update to 1.1.2 + +* Thu Dec 14 2006 Jason L Tibbitts III - 1.0.3-3 +- Rebuild for new Python + * Sat Sep 16 2006 Shahms E. King 1.0.3-2 - Rebuild for FC6 diff --git a/sources b/sources index 2aaea63..677d420 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b01f595b28de9cb75cd2e31ebc37c53 lxml-1.0.3.tgz +d18ecaacdecf7c9f02a6e9aecb16c720 lxml-1.1.2.tgz From 1b6c77f4bf8ff83137dbbb592482186a46aa3ee6 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Tue, 31 Jul 2007 11:37:53 +0000 Subject: [PATCH 3/5] Update to 1.3.3 --- .cvsignore | 2 +- python-lxml.spec | 14 +++++--------- sources | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index f130c7d..531984d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lxml-1.1.2.tgz +lxml-1.3.3.tgz diff --git a/python-lxml.spec b/python-lxml.spec index acb928e..9a95ed8 100644 --- a/python-lxml.spec +++ b/python-lxml.spec @@ -1,10 +1,9 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?python_version: %define python_version %(%{__python} -c "import sys ; print sys.version[:3]")} %define srcname lxml Name: python-%{srcname} -Version: 1.1.2 +Version: 1.3.3 Release: 1%{?dist} Summary: ElementTree-like Python bindings for libxml2 and libxslt @@ -18,7 +17,6 @@ BuildRequires: python-devel libxslt-devel python-setuptools # Upstream now includes the generated .c file and the Pyrex shipped # with FC (0.9.3.1) is broken for gcc >= 4.0 #BuildRequires: Pyrex >= 0.9.4 -Requires: python-abi = %{python_version} %description lxml provides a Python binding to the libxslt and libxml2 libraries. It @@ -49,14 +47,12 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README.txt LICENSES.txt PKG-INFO CREDITS.txt CHANGES.txt doc/ -%{python_sitearch}/lxml-%{version}-py%{python_version}.egg-info/ -%dir %{python_sitearch}/lxml -%{python_sitearch}/lxml/*.so -%{python_sitearch}/lxml/*.py -%{python_sitearch}/lxml/*.pyc -%{python_sitearch}/lxml/*.pyo +%{python_sitearch}/* %changelog +* Mon Jul 30 2007 Jeffrey C. Ollie - 1.3.3-1 +- Update to 1.3.3 + * Fri Jan 19 2007 Jeffrey C. Ollie - 1.1.2-1 - Update to 1.1.2 diff --git a/sources b/sources index 677d420..0346a9b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d18ecaacdecf7c9f02a6e9aecb16c720 lxml-1.1.2.tgz +2baa9f8ad14aa6dcfb763cfa0ce3bbcb lxml-1.3.3.tgz From ff2b24a26d2ab44162f1c52039350727a2f41c0d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:52:57 +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 2282443..af4fb17 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := python-lxml 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 f5ed7c551a4463c462760de50a9e3abc64a54115 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:29:11 +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 af4fb17..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-lxml -# $Id$ -NAME := python-lxml -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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6