diff --git a/python-pytz.changes b/python-pytz.changes index 56243a9..6f9f493 100644 --- a/python-pytz.changes +++ b/python-pytz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 30 12:09:19 UTC 2013 - dmueller@suse.com + +- remove conflicts with timezone, breaks the build + ------------------------------------------------------------------- Tue Apr 30 09:56:41 UTC 2013 - dmueller@suse.com diff --git a/python-pytz.spec b/python-pytz.spec index 15505b0..64691ce 100644 --- a/python-pytz.spec +++ b/python-pytz.spec @@ -24,7 +24,6 @@ Summary: World timezone definitions, modern and historical License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/p/pytz/pytz-%{version}.tar.bz2 -Conflicts: timezone < %version BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: python-tz = 2013b Obsoletes: python-tz < 2013b