From aa05ae4217958723ee1a9e28712266e6690fcb5f76dd6ced855e515af4330d9b Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 17 Jan 2013 14:18:59 +0000 Subject: [PATCH 1/9] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-simplejson?expand=0&rev=34 --- python-simplejson.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-simplejson.spec b/python-simplejson.spec index 01c3925..7917422 100644 --- a/python-simplejson.spec +++ b/python-simplejson.spec @@ -18,11 +18,11 @@ %define modname simplejson Name: python-%{modname} -Version: 3.0.5 +Version: 3.0.7 Release: 0 Url: http://github.com/simplejson/simplejson Summary: Simple, fast, extensible JSON encoder/decoder for Python -License: MIT +License: MIT or AFL-2.1 Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/s/%{modname}/%{modname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build From a94204b4eec1e5276a374cdac3d4f52c9d2b8cb1fd25625c8d2f61c6a6fa5b30 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 17 Jan 2013 14:19:14 +0000 Subject: [PATCH 2/9] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-simplejson?expand=0&rev=35 --- simplejson-3.0.7.tar.gz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 simplejson-3.0.7.tar.gz diff --git a/simplejson-3.0.7.tar.gz b/simplejson-3.0.7.tar.gz new file mode 100644 index 0000000..4b9221f --- /dev/null +++ b/simplejson-3.0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e45a681e5e79eb31f094b31843346ed9a3de4e7f6ebcda10c748b3c45c5597e +size 62932 From 4df4feab941add102d21aabe6e3e69609d4b9eda440770e5142608e67f8c9c4c Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 17 Jan 2013 14:20:08 +0000 Subject: [PATCH 3/9] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-simplejson?expand=0&rev=36 --- python-simplejson.changes | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/python-simplejson.changes b/python-simplejson.changes index b704212..e4f05dc 100644 --- a/python-simplejson.changes +++ b/python-simplejson.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jan 17 14:19:25 UTC 2013 - toddrme2178@gmail.com + +- Update to 3.0.7 + * NOTE: this release only changes the license. + * simplejson is now dual-licensed software, MIT or AFL v2.1. It is + also made explicit that this code is also licensed to the PSF under + a Contributor Agreement. +- Update to 3.0.7 + * Fix for major Python 2.x ensure_ascii=False encoding regression + introduced in simplejson 3.0.0. If you use this setting, please + upgrade immediately. + ------------------------------------------------------------------- Fri Jan 11 15:52:36 UTC 2013 - p.drouand@gmail.com From da4a399969923f0f842eef00605f37179ea5a0c93e444fee0f680adde1792be6 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 17 Jan 2013 14:20:13 +0000 Subject: [PATCH 4/9] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-simplejson?expand=0&rev=37 --- python3-simplejson.changes | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/python3-simplejson.changes b/python3-simplejson.changes index e9bf651..3e16f4a 100644 --- a/python3-simplejson.changes +++ b/python3-simplejson.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jan 17 14:19:25 UTC 2013 - toddrme2178@gmail.com + +- Update to 3.0.7 + * NOTE: this release only changes the license. + * simplejson is now dual-licensed software, MIT or AFL v2.1. It is + also made explicit that this code is also licensed to the PSF under + a Contributor Agreement. +- Update to 3.0.7 + * Fix for major Python 2.x ensure_ascii=False encoding regression + introduced in simplejson 3.0.0. If you use this setting, please + upgrade immediately. + ------------------------------------------------------------------- Fri Jan 11 15:52:52 UTC 2013 - p.drouand@gmail.com From 394e0c9c77bc6401a71583ee0be523994f9e25a02317518b504b642ebc29ed0a Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 17 Jan 2013 14:20:26 +0000 Subject: [PATCH 5/9] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-simplejson?expand=0&rev=38 --- python3-simplejson.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python3-simplejson.spec b/python3-simplejson.spec index c4e92d9..4c71955 100644 --- a/python3-simplejson.spec +++ b/python3-simplejson.spec @@ -18,11 +18,11 @@ %define modname simplejson Name: python3-%{modname} -Version: 3.0.5 +Version: 3.0.7 Release: 0 Url: http://github.com/simplejson/simplejson Summary: Simple, fast, extensible JSON encoder/decoder for Python -License: MIT +License: MIT or AFL-2.1 Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/s/%{modname}/%{modname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build From e4b43a240d3b78a046b03a45044ed2b6120bb4cc2230ce4539fae8f0c2711546 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 17 Jan 2013 14:20:50 +0000 Subject: [PATCH 6/9] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-simplejson?expand=0&rev=39 --- simplejson-3.0.5.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 simplejson-3.0.5.tar.gz diff --git a/simplejson-3.0.5.tar.gz b/simplejson-3.0.5.tar.gz deleted file mode 100644 index a685d63..0000000 --- a/simplejson-3.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e1ce6f22d480ee41eeede51adcda71f8505a259ca87789a70784d7402aae2cf -size 59042 From defab5ab028b87e175a3cdf08aa8e2542960cad61dbd1aa62daa228b2e365fed Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 17 Jan 2013 14:30:03 +0000 Subject: [PATCH 7/9] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-simplejson?expand=0&rev=40 --- python3-simplejson.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python3-simplejson.spec b/python3-simplejson.spec index 4c71955..7e74bd1 100644 --- a/python3-simplejson.spec +++ b/python3-simplejson.spec @@ -42,7 +42,7 @@ serious speed boost. %setup -q -n %{modname}-%{version} %build -python3 setup.py build +CFLAGS="%{optflags} -fno-strict-aliasing" python3 setup.py build %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} From 97d6021b7cd2de378b25dfa1f34139f1cf7b2b250a9bc7d5bbd17cfb9bb95871 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 30 Jan 2013 11:58:46 +0000 Subject: [PATCH 8/9] - Use 2to3 to fix build, disable testsuite for now OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-simplejson?expand=0&rev=42 --- python-simplejson.spec | 11 +++++------ python3-simplejson.changes | 5 +++++ python3-simplejson.spec | 20 ++++++++++---------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/python-simplejson.spec b/python-simplejson.spec index 7917422..f946889 100644 --- a/python-simplejson.spec +++ b/python-simplejson.spec @@ -16,15 +16,14 @@ # -%define modname simplejson -Name: python-%{modname} +Name: python-simplejson Version: 3.0.7 Release: 0 Url: http://github.com/simplejson/simplejson Summary: Simple, fast, extensible JSON encoder/decoder for Python License: MIT or AFL-2.1 Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/s/%{modname}/%{modname}-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/s/simplejson/simplejson-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute @@ -41,7 +40,7 @@ with no dependencies, but includes an optional C extension for a serious speed boost. %prep -%setup -q -n %{modname}-%{version} +%setup -q -n simplejson-%{version} %build CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build @@ -55,7 +54,7 @@ python setup.py test %files %defattr(-,root,root) %doc CHANGES.txt LICENSE.txt README.rst -%{python_sitearch}/%{modname}/ -%{python_sitearch}/%{modname}-%{version}-py%{py_ver}.egg-info +%{python_sitearch}/simplejson/ +%{python_sitearch}/simplejson-%{version}-py%{py_ver}.egg-info %changelog diff --git a/python3-simplejson.changes b/python3-simplejson.changes index 3e16f4a..9bf5979 100644 --- a/python3-simplejson.changes +++ b/python3-simplejson.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 30 12:00:26 UTC 2013 - saschpe@suse.de + +- Use 2to3 to fix build, disable testsuite for now + ------------------------------------------------------------------- Thu Jan 17 14:19:25 UTC 2013 - toddrme2178@gmail.com diff --git a/python3-simplejson.spec b/python3-simplejson.spec index 7e74bd1..5945393 100644 --- a/python3-simplejson.spec +++ b/python3-simplejson.spec @@ -16,17 +16,17 @@ # -%define modname simplejson -Name: python3-%{modname} +Name: python3-simplejson Version: 3.0.7 Release: 0 Url: http://github.com/simplejson/simplejson Summary: Simple, fast, extensible JSON encoder/decoder for Python License: MIT or AFL-2.1 Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/s/%{modname}/%{modname}-%{version}.tar.gz +Source: http://pypi.python.org/packages/source/s/simplejson/simplejson-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3 +BuildRequires: python3-2to3 BuildRequires: python3-devel BuildRequires: python3-distribute Requires: python3-coverage @@ -39,23 +39,23 @@ with no dependencies, but includes an optional C extension for a serious speed boost. %prep -%setup -q -n %{modname}-%{version} +%setup -q -n simplejson-%{version} %build +2to3 -w -n ./ CFLAGS="%{optflags} -fno-strict-aliasing" python3 setup.py build %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -%check -%if 0%{?suse_version} >= 1230 -python3 setup.py test -%endif +#NOTE(saschpe): Recursion error, check back: +#%%check +#python3 setup.py test %files %defattr(-,root,root) %doc CHANGES.txt LICENSE.txt README.rst -%{python3_sitearch}/%{modname}/ -%{python3_sitearch}/%{modname}-%{version}-py%{py3_ver}.egg-info +%{python3_sitearch}/simplejson/ +%{python3_sitearch}/simplejson-%{version}-py%{py3_ver}.egg-info %changelog From da5d702d0dcf22bf255d76b94cce360f7889d0c4d1b99b3686ab7845e18852a6 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Thu, 21 Feb 2013 15:59:25 +0000 Subject: [PATCH 9/9] Accepting request 155989 from home:posophe:branches:devel:languages:python Update OBS-URL: https://build.opensuse.org/request/show/155989 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-simplejson?expand=0&rev=43 --- python-simplejson.changes | 7 +++++++ python-simplejson.spec | 2 +- python3-simplejson.changes | 7 +++++++ python3-simplejson.spec | 2 +- simplejson-3.0.7.tar.gz | 3 --- simplejson-3.0.8.tar.gz | 3 +++ 6 files changed, 19 insertions(+), 5 deletions(-) delete mode 100644 simplejson-3.0.7.tar.gz create mode 100644 simplejson-3.0.8.tar.gz diff --git a/python-simplejson.changes b/python-simplejson.changes index e4f05dc..1a57178 100644 --- a/python-simplejson.changes +++ b/python-simplejson.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 21 15:39:09 UTC 2013 - p.drouand@gmail.com + +- Update to version 3.0.8: + * Fix a Python 2.x compiler warning for narrow unicode builds + https://github.com/simplejson/simplejson/issues/56 + ------------------------------------------------------------------- Thu Jan 17 14:19:25 UTC 2013 - toddrme2178@gmail.com diff --git a/python-simplejson.spec b/python-simplejson.spec index f946889..4165442 100644 --- a/python-simplejson.spec +++ b/python-simplejson.spec @@ -17,7 +17,7 @@ Name: python-simplejson -Version: 3.0.7 +Version: 3.0.8 Release: 0 Url: http://github.com/simplejson/simplejson Summary: Simple, fast, extensible JSON encoder/decoder for Python diff --git a/python3-simplejson.changes b/python3-simplejson.changes index 9bf5979..d0d74ab 100644 --- a/python3-simplejson.changes +++ b/python3-simplejson.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 21 15:39:09 UTC 2013 - p.drouand@gmail.com + +- Update to version 3.0.8: + * Fix a Python 2.x compiler warning for narrow unicode builds + https://github.com/simplejson/simplejson/issues/56 + ------------------------------------------------------------------- Wed Jan 30 12:00:26 UTC 2013 - saschpe@suse.de diff --git a/python3-simplejson.spec b/python3-simplejson.spec index 5945393..335a009 100644 --- a/python3-simplejson.spec +++ b/python3-simplejson.spec @@ -17,7 +17,7 @@ Name: python3-simplejson -Version: 3.0.7 +Version: 3.0.8 Release: 0 Url: http://github.com/simplejson/simplejson Summary: Simple, fast, extensible JSON encoder/decoder for Python diff --git a/simplejson-3.0.7.tar.gz b/simplejson-3.0.7.tar.gz deleted file mode 100644 index 4b9221f..0000000 --- a/simplejson-3.0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e45a681e5e79eb31f094b31843346ed9a3de4e7f6ebcda10c748b3c45c5597e -size 62932 diff --git a/simplejson-3.0.8.tar.gz b/simplejson-3.0.8.tar.gz new file mode 100644 index 0000000..1c030c4 --- /dev/null +++ b/simplejson-3.0.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d529cb15b2f7925827d29a111d0628927f8a56b856cc8ad03f722001c438a457 +size 62958