diff --git a/python-dateutil-2.0-system-zoneinfo.patch b/python-dateutil-2.0-system-zoneinfo.patch deleted file mode 100644 index 04277e0..0000000 --- a/python-dateutil-2.0-system-zoneinfo.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -up python-dateutil-1.5/dateutil/zoneinfo/__init__.py\~ python-dateutil-1.5/dateutil/zoneinfo/__init__.py ---- python-dateutil-1.5/dateutil/zoneinfo/__init__.py~ 2005-12-22 19:13:50.000000000 +0100 -+++ python-dateutil-1.5/dateutil/zoneinfo/__init__.py 2011-08-17 15:24:29.019214748 +0200 -@@ -15,6 +15,7 @@ __all__ = ["setcachesize", "gettz", "reb - - CACHE = [] - CACHESIZE = 10 -+USE_SYSTEM_ZONEINFO = True # XXX configure at build time - - class tzfile(tzfile): - def __reduce__(self): -@@ -29,7 +30,8 @@ def getzoneinfofile(): - return os.path.join(os.path.dirname(__file__), entry) - return None - --ZONEINFOFILE = getzoneinfofile() -+ZONEINFOFILE = getzoneinfofile() if USE_SYSTEM_ZONEINFO else None -+ZONEINFODIR = (os.getenv("TZDIR") or "/usr/share/zoneinfo").rstrip(os.sep) - - del getzoneinfofile - -@@ -39,22 +40,37 @@ def setcachesize(size): - del CACHE[size:] - - def gettz(name): -- tzinfo = None -- if ZONEINFOFILE: -- for cachedname, tzinfo in CACHE: -- if cachedname == name: -- break -+ for cachedname, tzinfo in CACHE: -+ if cachedname == name: -+ return tzinfo -+ -+ name_parts = name.lstrip('/').split('/') -+ for part in name_parts: -+ if part == os.path.pardir or os.path.sep in part: -+ raise ValueError('Bad path segment: %r' % part) -+ filename = os.path.join(ZONEINFODIR, *name_parts) -+ try: -+ zonefile = open(filename, "rb") -+ except: -+ tzinfo = None -+ else: -+ tzinfo = tzfile(zonefile) -+ zonefile.close() -+ -+ if tzinfo is None and ZONEINFOFILE: -+ tf = TarFile.open(ZONEINFOFILE) -+ try: -+ zonefile = tf.extractfile(name) -+ except KeyError: -+ tzinfo = None - else: -- tf = TarFile.open(ZONEINFOFILE) -- try: -- zonefile = tf.extractfile(name) -- except KeyError: -- tzinfo = None -- else: -- tzinfo = tzfile(zonefile) -- tf.close() -- CACHE.insert(0, (name, tzinfo)) -- del CACHE[CACHESIZE:] -+ tzinfo = tzfile(zonefile) -+ tf.close() -+ -+ if tzinfo is not None: -+ CACHE.insert(0, (name, tzinfo)) -+ del CACHE[CACHESIZE:] -+ - return tzinfo - - def rebuild(filename, tag=None, format="gz"): diff --git a/python-dateutil.spec b/python-dateutil.spec index 2b7fb1a..2d8d743 100644 --- a/python-dateutil.spec +++ b/python-dateutil.spec @@ -1,13 +1,14 @@ Name: python-dateutil -Version: 2.2 -Release: 1%{?dist} +Version: 1.5 +Release: 0%{?dist} +Epoch: 1 Summary: Powerful extensions to the standard datetime module Group: Development/Languages License: Python URL: http://labix.org/python-dateutil Source0: http://labix.org/download/%{name}/%{name}-%{version}.tar.gz -Patch0: python-dateutil-2.0-system-zoneinfo.patch +Patch0: python-dateutil-1.5-system-zoneinfo.patch BuildArch: noarch BuildRequires: python-devel,python-setuptools @@ -36,6 +37,9 @@ mv NEWS.new NEWS %{python_sitelib}/*.egg-info %changelog +* Tue Aug 05 2014 Jon Ciesla - 1:1.5-9 +- Reverting to 1.5 pre user feedback and upstream. + * Mon Aug 04 2014 Jon Ciesla - 2.2-1 - Update to 2.2, BZ 1126521. - Fix bad dates. diff --git a/sources b/sources index ac213b6..fa72316 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1f654d0ff7e33999380a8ba9783fd5c python-dateutil-2.2.tar.gz +35f3732db3f2cc4afdc68a8533b60a52 python-dateutil-1.5.tar.gz