summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2014-07-21 21:32:00 (GMT)
committerToshio Kuratomi <toshio@fedoraproject.org>2014-07-21 21:32:00 (GMT)
commitd4bd5eaf36c087f42ace04c32758584aa5a73f98 (patch)
treef1d49f14fba9b653864a226af7a7c25fe8d4f82c
parent6cd104b847a886d8cfc0260057a601b4948b3919 (diff)
downloadpython-cheetah-HEAD.zip
python-cheetah-HEAD.tar.gz
python-cheetah-HEAD.tar.xz
Since we're leaving out the dep on markdown in the rpm requirements we needHEADmaster
to leave it out of egginfo as well otherwise pkg_resources using code breaks
-rw-r--r--cheetah-optional-deps.patch16
-rw-r--r--python-cheetah.spec8
2 files changed, 23 insertions, 1 deletions
diff --git a/cheetah-optional-deps.patch b/cheetah-optional-deps.patch
new file mode 100644
index 0000000..5d113ad
--- /dev/null
+++ b/cheetah-optional-deps.patch
@@ -0,0 +1,16 @@
+diff -up Cheetah-2.4.4/SetupConfig.py.bak Cheetah-2.4.4/SetupConfig.py
+--- Cheetah-2.4.4/SetupConfig.py.bak 2014-07-21 14:24:11.839067227 -0700
++++ Cheetah-2.4.4/SetupConfig.py 2014-07-21 14:28:28.642988415 -0700
+@@ -60,7 +60,11 @@ if not os.getenv('CHEETAH_INSTALL_WITHOU
+ try:
+ from setuptools import setup
+ install_requires = [
+- "Markdown >= 2.0.1",
++ # Markdown is an optional dep (Cheetah still works without it).
++ # Removing markdown as a hard requirement here as the
++ # setuptools dep makes markdown a hard dependency for any code
++ # that uses pkg_resources
++ #"Markdown >= 2.0.1",
+ ]
+ if sys.platform == 'win32':
+ # use 'entry_points' instead of 'scripts'
diff --git a/python-cheetah.spec b/python-cheetah.spec
index 967ee7d..f04a01a 100644
--- a/python-cheetah.spec
+++ b/python-cheetah.spec
@@ -1,6 +1,6 @@
Name: python-cheetah
Version: 2.4.4
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Template engine and code generator
Group: Development/Libraries
@@ -9,6 +9,7 @@ URL: http://cheetahtemplate.org/
Source: http://pypi.python.org/packages/source/C/Cheetah/Cheetah-%{version}.tar.gz
Patch0: cheetah-2.4.4-dont-run-tests-twice.patch
+Patch1: cheetah-optional-deps.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -28,6 +29,7 @@ Java, SQL, form emails and even Python code.
%prep
%setup -q -n Cheetah-%{version}
%patch0 -p1
+%patch1 -p1
# remove unnecessary shebang lines to silence rpmlint
%{__sed} -i -e '/^#!/,1d' cheetah/Tests/* \
cheetah/DirectiveAnalyzer.py cheetah/Utils/Misc.py
@@ -81,6 +83,10 @@ rm -rf %{buildroot}
%{python_sitearch}/Cheetah-%{version}-*.egg-info/*.txt
%changelog
+* Mon Jul 21 2014 Toshio Kuratomi <toshio@fedoraproject.org> - 2.4.4-8
+- Since we're leaving out the dep on markdown in the rpm requirements we need
+ to leave it out of egginfo as well otherwise pkg_resources using code breaks
+
* Thu Jun 19 2014 Matthew Miller <mattdm@fedoraproject.org> - 2.4.4-7
- remove python-markdown and python-pygments hard dependencies