[python-tw2-jqplugins-ui/el6] Fix webob version complaint.
Ralph Bean
ralph at fedoraproject.org
Mon May 7 18:34:33 UTC 2012
commit 3e38fec4c05c4a9219ec655fa07ebeea86b8dede
Author: Ralph Bean <rbean at redhat.com>
Date: Mon May 7 14:34:27 2012 -0400
Fix webob version complaint.
python-tw2-jqplugins-ui.spec | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/python-tw2-jqplugins-ui.spec b/python-tw2-jqplugins-ui.spec
index 63bf726..ff27deb 100644
--- a/python-tw2-jqplugins-ui.spec
+++ b/python-tw2-jqplugins-ui.spec
@@ -4,14 +4,13 @@
Name: python-tw2-jqplugins-ui
Version: 2.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: jQuery UI for ToscaWidgets2
Group: Development/Languages
License: MIT
URL: http://toscawidgets.org
Source0: http://pypi.python.org/packages/source/t/%{modname}/%{modname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# For building, generally
@@ -68,6 +67,18 @@ jQuery UI widgets.
%prep
%setup -q -n %{modname}-%{version}
+%if %{?rhel}%{!?rhel:0} >= 6
+
+# Make sure that epel/rhel picks up the correct version of webob
+awk 'NR==1{print "import __main__; __main__.__requires__ = __requires__ = [\"WebOb>=1.0\"]; import pkg_resources"}1' setup.py > setup.py.tmp
+mv setup.py.tmp setup.py
+
+# Remove all the fancy nosetests configuration for older python
+rm setup.cfg
+
+%endif
+
+
%build
%{__python} setup.py build
# This is a hack to get the jqplugins to not stomp all over each others
@@ -75,24 +86,23 @@ jQuery UI widgets.
rm -f build/lib/tw2/jqplugins/__init__.py*
%install
-rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build \
--install-data=%{_datadir} --root %{buildroot}
%check
PYTHONPATH=$(pwd) python setup.py test
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%doc README.rst LICENSE.txt
%{python_sitelib}/tw2/jqplugins/ui
%{python_sitelib}/%{modname}-%{version}*
%changelog
+* Mon May 07 2012 Ralph Bean <rbean at redhat.com> - 2.0.1-3
+- webob version hack in the %%prep section for el6
+- removed defattr and spurious buildroot references
+
* Mon May 07 2012 Ralph Bean <rbean at redhat.com> - 2.0.1-2
- More specific directory ownership.
More information about the scm-commits
mailing list