From a1557553188acb007345956778e293a019b63665 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 06:35:36 +0000 Subject: [PATCH 1/4] Initialize branch F-12 for python-jinja2 --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From ee7e091f2c8ea88d7da32c21343cd8dd701e126c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:52:21 +0000 Subject: [PATCH 2/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2ba35e3..54df830 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: python-jinja2 -# $Id$ +# $Id: Makefile,v 1.1 2008/07/23 03:02:27 kevin Exp $ NAME := python-jinja2 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 aafa4e11c278a54c50926af8e85893a15fecf63b Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 27 Feb 2010 14:05:49 +0000 Subject: [PATCH 3/4] - Update to 2.3.1. - Docs are built using Sphinx now. - Run the testsuite. --- .cvsignore | 2 +- import.log | 1 + python-jinja2.spec | 28 +++++++++++++++++++++------- sources | 2 +- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1146c94..c02a534 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Jinja2-2.2.1.tar.gz +Jinja2-2.3.1.tar.gz diff --git a/import.log b/import.log index a58465b..b6757ca 100644 --- a/import.log +++ b/import.log @@ -2,3 +2,4 @@ python-jinja2-2_0-2_fc9:HEAD:python-jinja2-2.0-2.fc9.src.rpm:1216886150 python-jinja2-2_1-1_fc10:HEAD:python-jinja2-2.1-1.fc10.src.rpm:1229610786 python-jinja2-2_1_1-1_fc10:HEAD:python-jinja2-2.1.1-1.fc10.src.rpm:1231601194 python-jinja2-2_2_1-1_fc11:HEAD:python-jinja2-2.2.1-1.fc11.src.rpm:1253462191 +python-jinja2-2_3_1-1_fc12:F-12:python-jinja2-2.3.1-1.fc12.src.rpm:1267279408 diff --git a/python-jinja2.spec b/python-jinja2.spec index 7f0e836..2caf2f1 100644 --- a/python-jinja2.spec +++ b/python-jinja2.spec @@ -1,7 +1,7 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-jinja2 -Version: 2.2.1 +Version: 2.3.1 Release: 1%{?dist} Summary: General purpose template engine Group: Development/Languages @@ -11,8 +11,10 @@ Source0: http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.g BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: python-setuptools-devel +BuildRequires: python-sphinx Requires: python-babel >= 0.8 + %description Jinja2 is a template engine written in pure Python. It provides a Django inspired non-XML syntax but supports inline expressions and an @@ -28,9 +30,13 @@ environments. %prep %setup -q -n Jinja2-%{version} +# fix EOL +sed -i 's|\r$||g' LICENSE + %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py --with-speedups build +make -C docs html %install @@ -38,9 +44,6 @@ rm -rf %{buildroot} %{__python} setup.py --with-speedups install -O1 --skip-build \ --root %{buildroot} -# fix EOL -sed -i 's|\r$||g' LICENSE - # ensure correct permission chmod 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so @@ -52,14 +55,25 @@ rm -rf docs/_build/html/.buildinfo rm -rf %{buildroot} +%check +make test + + %files %defattr(-,root,root,-) -%doc AUTHORS CHANGES LICENSE TODO -%doc docs/_build/html ext +%doc AUTHORS CHANGES LICENSE +%doc docs/_build/html +%doc ext %{python_sitearch}/* +%exclude %{python_sitearch}/jinja2/_speedups.c %changelog +* Tue Feb 23 2010 Thomas Moschny - 2.3.1-1 +- Update to 2.3.1. +- Docs are built using Sphinx now. +- Run the testsuite. + * Sat Sep 19 2009 Thomas Moschny - 2.2.1-1 - Update to 2.2.1, mainly a bugfix release. - Remove patch no longer needed. diff --git a/sources b/sources index b4fdf34..544e80c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fea849d68891218eb0b21c170f1c32d5 Jinja2-2.2.1.tar.gz +391c7dd06c62dfe7e30ebaad7af0a401 Jinja2-2.3.1.tar.gz From a2aec8b7c29ed84c9a2eb91d52577b7784ec837b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:25:22 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 5 ----- 4 files changed, 27 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 54df830..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-jinja2 -# $Id: Makefile,v 1.1 2008/07/23 03:02:27 kevin Exp $ -NAME := python-jinja2 -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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index b6757ca..0000000 --- a/import.log +++ /dev/null @@ -1,5 +0,0 @@ -python-jinja2-2_0-2_fc9:HEAD:python-jinja2-2.0-2.fc9.src.rpm:1216886150 -python-jinja2-2_1-1_fc10:HEAD:python-jinja2-2.1-1.fc10.src.rpm:1229610786 -python-jinja2-2_1_1-1_fc10:HEAD:python-jinja2-2.1.1-1.fc10.src.rpm:1231601194 -python-jinja2-2_2_1-1_fc11:HEAD:python-jinja2-2.2.1-1.fc11.src.rpm:1253462191 -python-jinja2-2_3_1-1_fc12:F-12:python-jinja2-2.3.1-1.fc12.src.rpm:1267279408