From 743aef0737b9859cb4ce95aa50b66a50df23b026102f5a4636bf45a4578afb17 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 30 Apr 2013 12:11:19 +0000 Subject: [PATCH] Accepting request 173956 from home:dirkmueller:branches:devel:languages:python - remove conflicts with timezone, breaks the build OBS-URL: https://build.opensuse.org/request/show/173956 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytz?expand=0&rev=7 --- python-pytz.changes | 5 +++++ python-pytz.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) 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