From dc0e55d3755f13414474e10756708af1e71ae54c52cda1b5585b24af6a8cd734 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Mon, 29 Apr 2013 12:34:30 +0000 Subject: [PATCH 1/3] Accepting request 173736 from home:dirkmueller:branches:devel:languages:python - update to 2013b: * Sync with timezone 2013b release OBS-URL: https://build.opensuse.org/request/show/173736 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytz?expand=0&rev=5 --- python-pytz.changes | 6 ++++++ python-pytz.spec | 6 ++++-- python3-pytz.spec | 5 +++-- pytz-2012j.tar.bz2 | 3 --- pytz-2013b.tar.bz2 | 3 +++ 5 files changed, 16 insertions(+), 7 deletions(-) delete mode 100644 pytz-2012j.tar.bz2 create mode 100644 pytz-2013b.tar.bz2 diff --git a/python-pytz.changes b/python-pytz.changes index ee92575..335291d 100644 --- a/python-pytz.changes +++ b/python-pytz.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 29 12:11:02 UTC 2013 - dmueller@suse.com + +- update to 2013b: + * Sync with timezone 2013b release + ------------------------------------------------------------------- Mon Jan 14 18:35:51 UTC 2013 - p.drouand@gmail.com diff --git a/python-pytz.spec b/python-pytz.spec index fa10e5c..ac63510 100644 --- a/python-pytz.spec +++ b/python-pytz.spec @@ -11,18 +11,20 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-pytz -Version: 2012j +Version: 2013b Release: 0 Url: http://pytz.sourceforge.net 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 BuildRequires: fdupes BuildRequires: python-devel diff --git a/python3-pytz.spec b/python3-pytz.spec index 36eb136..b4ff9dd 100644 --- a/python3-pytz.spec +++ b/python3-pytz.spec @@ -11,12 +11,13 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python3-pytz -Version: 2012j +Version: 2013b Release: 0 Url: http://pytz.sourceforge.net Summary: World timezone definitions, modern and historical diff --git a/pytz-2012j.tar.bz2 b/pytz-2012j.tar.bz2 deleted file mode 100644 index 1ae5aed..0000000 --- a/pytz-2012j.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fe28ec30c371e3864f4f9b7c9df9bb8351be707b7a128ae4443b0d559d6cbf1 -size 214712 diff --git a/pytz-2013b.tar.bz2 b/pytz-2013b.tar.bz2 new file mode 100644 index 0000000..98b9887 --- /dev/null +++ b/pytz-2013b.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65eb49cc05b7917fddc61e1fe6d8a4512c295cb53891dd5ec816bcccdce3f1a5 +size 199509 From bc7cf7bcab3d56cab53e0e348b63a2a452f3e8dc9104c86e336892940d79a131 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Tue, 30 Apr 2013 11:50:21 +0000 Subject: [PATCH 2/3] Accepting request 173931 from home:dirkmueller:branches:devel:languages:python - add provides/obsoletes on python(3)-tz - add provides/obsoletes on python(3)-tz OBS-URL: https://build.opensuse.org/request/show/173931 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytz?expand=0&rev=6 --- python-pytz.changes | 5 +++++ python-pytz.spec | 2 ++ python3-pytz.changes | 5 +++++ python3-pytz.spec | 2 ++ 4 files changed, 14 insertions(+) diff --git a/python-pytz.changes b/python-pytz.changes index 335291d..56243a9 100644 --- a/python-pytz.changes +++ b/python-pytz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 30 09:56:41 UTC 2013 - dmueller@suse.com + +- add provides/obsoletes on python(3)-tz + ------------------------------------------------------------------- Mon Apr 29 12:11:02 UTC 2013 - dmueller@suse.com diff --git a/python-pytz.spec b/python-pytz.spec index ac63510..15505b0 100644 --- a/python-pytz.spec +++ b/python-pytz.spec @@ -26,6 +26,8 @@ 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 BuildRequires: fdupes BuildRequires: python-devel #BuildRequires: python-nose diff --git a/python3-pytz.changes b/python3-pytz.changes index 30ec3b4..7fbb8be 100644 --- a/python3-pytz.changes +++ b/python3-pytz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 30 09:56:41 UTC 2013 - dmueller@suse.com + +- add provides/obsoletes on python(3)-tz + ------------------------------------------------------------------- Mon Jan 14 18:36:04 UTC 2013 - p.drouand@gmail.com diff --git a/python3-pytz.spec b/python3-pytz.spec index b4ff9dd..4b1bf48 100644 --- a/python3-pytz.spec +++ b/python3-pytz.spec @@ -25,6 +25,8 @@ License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/p/pytz/pytz-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: python3-tz = 2013b +Obsoletes: python3-tz < 2013b BuildRequires: fdupes BuildRequires: python3 BuildRequires: python3-devel From 743aef0737b9859cb4ce95aa50b66a50df23b026102f5a4636bf45a4578afb17 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 30 Apr 2013 12:11:19 +0000 Subject: [PATCH 3/3] 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