diff --git a/python-WSGIProxy2.changes b/python-WSGIProxy2.changes index 30f2640..2e0a2a8 100644 --- a/python-WSGIProxy2.changes +++ b/python-WSGIProxy2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 2 12:46:32 UTC 2013 - speilicke@suse.com + +- Conflict with python-WSGIProxy + ------------------------------------------------------------------- Mon Apr 29 13:39:22 UTC 2013 - speilicke@suse.com diff --git a/python-WSGIProxy2.spec b/python-WSGIProxy2.spec index cb674a3..081978d 100644 --- a/python-WSGIProxy2.spec +++ b/python-WSGIProxy2.spec @@ -27,6 +27,7 @@ BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: python-six BuildRequires: python-WebOb +Conflicts: python-WSGIProxy BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}