From 65abce52aa798846351c143730271806e302788e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 23 Jul 2008 03:02:48 +0000 Subject: [PATCH 1/4] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From efa9e0f157fa83d57a3b085516bd1869707f04b6 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 24 Jul 2008 08:14:17 +0000 Subject: [PATCH 2/4] New package. --- .cvsignore | 1 + import.log | 1 + python-jinja2-docs.patch | 12 +++++++ python-jinja2.spec | 75 ++++++++++++++++++++++++++++++++++++++++ sources | 1 + 5 files changed, 90 insertions(+) create mode 100644 import.log create mode 100644 python-jinja2-docs.patch create mode 100644 python-jinja2.spec diff --git a/.cvsignore b/.cvsignore index e69de29..1452d8e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +Jinja2-2.0.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..95df0b7 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +python-jinja2-2_0-2_fc10:F-8:python-jinja2-2.0-2.fc10.src.rpm:1216887238 diff --git a/python-jinja2-docs.patch b/python-jinja2-docs.patch new file mode 100644 index 0000000..1869540 --- /dev/null +++ b/python-jinja2-docs.patch @@ -0,0 +1,12 @@ +diff -up Jinja2-2.0rc1/setup.py.orig Jinja2-2.0rc1/setup.py +--- Jinja2-2.0rc1/setup.py.orig 2008-06-29 01:44:48.000000000 +0200 ++++ Jinja2-2.0rc1/setup.py 2008-06-29 01:48:00.000000000 +0200 +@@ -51,7 +51,7 @@ from distutils.errors import CCompilerEr + + 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 new file mode 100644 index 0000000..8262ad3 --- /dev/null +++ b/python-jinja2.spec @@ -0,0 +1,75 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +Name: python-jinja2 +Version: 2.0 +Release: 2%{?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 + +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 +optional sandboxed environment. + +If you have any exposure to other text-based template languages, such +as Smarty or Django, you should feel right at home with Jinja2. It's +both designer and developer friendly by sticking to Python's +principles and adding functionality useful for templating +environments. + + +%prep +%setup -q -n Jinja2-%{version} +%patch0 -p1 -b .docs + + +%build +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build + + +%install +rm -rf %{buildroot} +%{__python} setup.py 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 + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc AUTHORS CHANGES LICENSE TODO +%doc docs/_build/html ext +%{python_sitearch}/* + + +%changelog +* Tue Jul 22 2008 Thomas Moschny - 2.0-2 +- Use rpm buildroot macro instead of RPM_BUILD_ROOT. + +* Sun Jul 20 2008 Thomas Moschny - 2.0-1 +- Upstream released 2.0. + +* 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 e69de29..6c640be 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +19fe3ee10ee94a6003c53374112f2403 Jinja2-2.0.tar.gz From cc95fa7b1b0d65736791662d64c33ece6cd8cbeb Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:52:21 +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 dc762da51f3b1a6e0bef6c01552d85d100c20ebf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:25:20 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8 diff --git a/import.log b/import.log deleted file mode 100644 index 95df0b7..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -python-jinja2-2_0-2_fc10:F-8:python-jinja2-2.0-2.fc10.src.rpm:1216887238