jjames pushed to python-persistent (master). "New upstream version. Drop upstreamed -timestamp patch."

[notifications at fedoraproject.org]

From 5c72f05192a876468107b0a2af94fd60d8c7f331 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry at gmail.com>
Date: Sat, 23 May 2015 16:14:55 -0600
Subject: New upstream version.  Drop upstreamed -timestamp patch.


diff --git a/.gitignore b/.gitignore
index adb60c4..5ff6d1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/persistent-4.0.8.tar.gz
 /persistent-4.0.9.tar.gz
+/persistent-4.1.0.tar.gz
diff --git a/python-persistent-timestamp.patch b/python-persistent-timestamp.patch
deleted file mode 100644
index 022441d..0000000
--- a/python-persistent-timestamp.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- ./persistent/tests/test_timestamp.py.orig	2015-04-08 08:51:03.000000000 -0600
-+++ ./persistent/tests/test_timestamp.py	2015-04-14 17:14:14.327905968 -0600
-@@ -13,6 +13,7 @@
- ##############################################################################
- import operator
- import unittest
-+from ctypes import c_long
- 
- class Test__UTC(unittest.TestCase):
- 
-@@ -269,24 +270,24 @@ class PyAndCComparisonTests(unittest.Tes
-         self.assertEqual(hash(c), hash(py))
- 
-         c, py = self._make_C_and_Py(b'\x00\x00\x00\x00\x00\x01\x00\x00')
--        self.assertEqual(hash(c), 1000006000001)
-+        self.assertEqual(hash(c), c_long(1000006000001).value)
-         self.assertEqual(hash(c), hash(py))
- 
-         c, py = self._make_C_and_Py(b'\x00\x00\x00\x00\x01\x00\x00\x00')
--        self.assertEqual(hash(c), 1000009000027000019)
-+        self.assertEqual(hash(c), c_long(1000009000027000019).value)
-         self.assertEqual(hash(c), hash(py))
- 
-         # Overflow kicks in at this point
-         c, py = self._make_C_and_Py(b'\x00\x00\x00\x01\x00\x00\x00\x00')
--        self.assertEqual(hash(c), -4442925868394654887)
-+        self.assertEqual(hash(c), c_long(-4442925868394654887).value)
-         self.assertEqual(hash(c), hash(py))
- 
-         c, py = self._make_C_and_Py(b'\x00\x00\x01\x00\x00\x00\x00\x00')
--        self.assertEqual(hash(c), -3993531167153147845)
-+        self.assertEqual(hash(c), c_long(-3993531167153147845).value)
-         self.assertEqual(hash(c), hash(py))
- 
-         c, py = self._make_C_and_Py(b'\x01\x00\x00\x00\x00\x00\x00\x00')
--        self.assertEqual(hash(c), -3099646879006235965)
-+        self.assertEqual(hash(c), c_long(-3099646879006235965).value)
-         self.assertEqual(hash(c), hash(py))
- 
-     def test_ordering(self):
---- ./persistent/timestamp.py.orig	2015-04-08 08:47:04.000000000 -0600
-+++ ./persistent/timestamp.py	2015-04-14 17:13:34.247960122 -0600
-@@ -13,7 +13,7 @@
- ##############################################################################
- __all__ = ('TimeStamp',)
- 
--from ctypes import c_int64
-+from ctypes import c_long
- import datetime
- import math
- import struct
-@@ -158,7 +158,7 @@ class pyTimeStamp(object):
- 
-         # Make sure to overflow and wraparound just
-         # like the C code does.
--        x = c_int64(x).value
-+        x = c_long(x).value
-         if x == -1: #pragma: no cover
-             # The C version has this condition, but it's not clear
-             # why; it's also not immediately obvious what bytestring
diff --git a/python-persistent.spec b/python-persistent.spec
index 54f0a73..7fe68bf 100644
--- a/python-persistent.spec
+++ b/python-persistent.spec
@@ -5,15 +5,13 @@
 %global pkgname persistent
 
 Name:           python-%{pkgname}
-Version:        4.0.9
+Version:        4.1.0
 Release:        1%{?dist}
 Summary:        Translucent persistent python objects
 
 License:        ZPLv2.1
 URL:            http://www.zodb.org/
 Source0:        https://pypi.python.org/packages/source/p/%{pkgname}/%{pkgname}-%{version}.tar.gz
-# Fix timestamp hash codes on 32-bit platforms
-Patch0:         %{name}-timestamp.patch
 
 BuildRequires:  python-devel
 BuildRequires:  python-nose
@@ -89,10 +87,6 @@ Documentation for %{name}.
 %prep
 %setup -q -c
 
-pushd %{pkgname}-%{version}
-%patch0
-popd
-
 # Remove prebuilt egg and documentation
 rm -fr %{pkgname}-%{version}/%{pkgname}.egg-info \
   %{pkgname}-%{version}/docs/_build
@@ -179,6 +173,10 @@ popd
 %endif
 
 %changelog
+* Sat May 23 2015 Jerry James <loganjerry at gmail.com> - 4.1.0-1
+- New upstream version
+- Drop upstreamed -timestamp patch
+
 * Tue Apr 14 2015 Jerry James <loganjerry at gmail.com> - 4.0.9-1
 - New upstream version
 
diff --git a/sources b/sources
index eb0b3e6..2e45bc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aaa93ce7bcb8e36b5088ae92a717ec78  persistent-4.0.9.tar.gz
+9b3b71279271463f7d497352adbce5aa  persistent-4.1.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-persistent.git/commit/?h=master&id=5c72f05192a876468107b0a2af94fd60d8c7f331