From 7d9a1c1f6105a09fbdecb76f3750f13947139f30 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:50:05 +0000 Subject: [PATCH 1/4] Initialize branch F-11 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..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 4ada0807b0d1843f716f6b688d8f87ebd43adb11 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 20 Sep 2009 16:25:53 +0000 Subject: [PATCH 2/4] Update to 2.2.1. --- .cvsignore | 2 +- import.log | 1 + python-jinja2-docs.patch | 12 ------------ python-jinja2.spec | 38 +++++++++++++++++++++----------------- sources | 2 +- 5 files changed, 24 insertions(+), 31 deletions(-) delete mode 100644 python-jinja2-docs.patch diff --git a/.cvsignore b/.cvsignore index 3aac9b6..1146c94 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Jinja2-2.1.1.tar.gz +Jinja2-2.2.1.tar.gz diff --git a/import.log b/import.log index f55783f..7dd5d28 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,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:F-11:python-jinja2-2.2.1-1.fc11.src.rpm:1253463921 diff --git a/python-jinja2-docs.patch b/python-jinja2-docs.patch deleted file mode 100644 index 61310bf..0000000 --- a/python-jinja2-docs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Jinja2-2.1/setup.py.orig Jinja2-2.1/setup.py ---- Jinja2-2.1/setup.py.orig 2008-11-23 13:08:17.000000000 +0100 -+++ Jinja2-2.1/setup.py 2008-12-18 15:14:22.000000000 +0100 -@@ -54,7 +54,7 @@ VERSION = '2.1' - - data_files = [] - documentation_path = 'docs/_build/html' --if os.path.exists(documentation_path): -+if os.path.exists(documentation_path) and False: - documentation_files = [] - for fn in os.listdir(documentation_path): - if not fn.startswith('.'): diff --git a/python-jinja2.spec b/python-jinja2.spec index 5968ece..7f0e836 100644 --- a/python-jinja2.spec +++ b/python-jinja2.spec @@ -1,24 +1,16 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-jinja2 -Version: 2.1.1 -Release: 2%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Summary: General purpose template engine - Group: Development/Languages License: BSD URL: http://jinja.pocoo.org/ Source0: http://pypi.python.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz -Patch0: %{name}-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel - -%if 0%{?fedora} >= 8 -BuildRequires: python-setuptools-devel -%else -BuildRequires: python-setuptools -%endif - +BuildRequires: python-setuptools-devel Requires: python-babel >= 0.8 %description @@ -35,22 +27,26 @@ environments. %prep %setup -q -n Jinja2-%{version} -%patch0 -p1 -b .docs %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py --with-speedups build %install rm -rf %{buildroot} -%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__python} setup.py --with-speedups install -O1 --skip-build \ + --root %{buildroot} # fix EOL sed -i 's|\r$||g' LICENSE -# fix wrong permission -%{__chmod} 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so +# ensure correct permission +chmod 0755 %{buildroot}%{python_sitearch}/jinja2/_speedups.so + +# remove hidden file +rm -rf docs/_build/html/.buildinfo + %clean rm -rf %{buildroot} @@ -64,6 +60,15 @@ rm -rf %{buildroot} %changelog +* Sat Sep 19 2009 Thomas Moschny - 2.2.1-1 +- Update to 2.2.1, mainly a bugfix release. +- Remove patch no longer needed. +- Remove conditional for FC-8. +- Compilation of speedup module has to be explicitly requested now. + +* Sun Jul 26 2009 Fedora Release Engineering - 2.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 2.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -85,4 +90,3 @@ rm -rf %{buildroot} * Sun Jun 29 2008 Thomas Moschny - 2.0-0.1.rc1 - Modified specfile from the existing python-jinja package. - diff --git a/sources b/sources index b485bf3..b4fdf34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b37fc262e4f613eec57c3defe6aea97c Jinja2-2.1.1.tar.gz +fea849d68891218eb0b21c170f1c32d5 Jinja2-2.2.1.tar.gz From fa6584a86cda84dcb9b26ea510b08f4388388348 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:52:20 +0000 Subject: [PATCH 3/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 feaa6da7696f9cf984ea998ffd618f6e0b15b6e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:25:26 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 4 ---- 4 files changed, 26 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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index 7dd5d28..0000000 --- a/import.log +++ /dev/null @@ -1,4 +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:F-11:python-jinja2-2.2.1-1.fc11.src.rpm:1253463921