rpms/python-jinja2/devel .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 python-jinja2.spec, 1.6, 1.7 sources, 1.4, 1.5 python-jinja2-docs.patch, 1.2, NONE

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/python-jinja2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31796/devel

Modified Files:
	.cvsignore import.log python-jinja2.spec sources 
Removed Files:
	python-jinja2-docs.patch 
Log Message:
Update to 2.2.1.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	10 Jan 2009 15:27:07 -0000	1.4
+++ .cvsignore	20 Sep 2009 16:10:00 -0000	1.5
@@ -1 +1 @@
-Jinja2-2.1.1.tar.gz
+Jinja2-2.2.1.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	10 Jan 2009 15:27:07 -0000	1.3
+++ import.log	20 Sep 2009 16:10:00 -0000	1.4
@@ -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:HEAD:python-jinja2-2.2.1-1.fc11.src.rpm:1253462191


Index: python-jinja2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/python-jinja2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- python-jinja2.spec	26 Jul 2009 20:29:42 -0000	1.6
+++ python-jinja2.spec	20 Sep 2009 16:10:00 -0000	1.7
@@ -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:	3%{?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,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 19 2009 Thomas Moschny <thomas.moschny at gmx.de> - 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 <rel-eng at lists.fedoraproject.org> - 2.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -88,4 +90,3 @@ rm -rf %{buildroot}
 
 * Sun Jun 29 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.0-0.1.rc1
 - Modified specfile from the existing python-jinja package.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-jinja2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	10 Jan 2009 15:27:07 -0000	1.4
+++ sources	20 Sep 2009 16:10:00 -0000	1.5
@@ -1 +1 @@
-b37fc262e4f613eec57c3defe6aea97c  Jinja2-2.1.1.tar.gz
+fea849d68891218eb0b21c170f1c32d5  Jinja2-2.2.1.tar.gz


--- python-jinja2-docs.patch DELETED ---