From 1a276a31197794b7f67b0e111df6ff8201488821de7eedd40f2cdc6ca97d9c11 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 2 May 2013 09:11:24 +0000 Subject: [PATCH 1/2] Accepting request 173963 from home:dirkmueller:branches:devel:languages:python - Update to 1.2.8: * add python 3.x support - Update to 1.2.8: * add python 3.x support OBS-URL: https://build.opensuse.org/request/show/173963 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-MiniMock?expand=0&rev=12 --- MiniMock-1.2.7.tar.gz | 3 --- MiniMock-1.2.8.tar.gz | 3 +++ python-MiniMock.changes | 6 ++++++ python-MiniMock.spec | 8 +++----- python3-MiniMock.changes | 6 ++++++ python3-MiniMock.spec | 9 ++++----- 6 files changed, 22 insertions(+), 13 deletions(-) delete mode 100644 MiniMock-1.2.7.tar.gz create mode 100644 MiniMock-1.2.8.tar.gz diff --git a/MiniMock-1.2.7.tar.gz b/MiniMock-1.2.7.tar.gz deleted file mode 100644 index 7f947ad..0000000 --- a/MiniMock-1.2.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3de5c14b986f984fa3cc113035d8b21b6c29c92d9f8b31cd34d33002e2fbb33b -size 15118 diff --git a/MiniMock-1.2.8.tar.gz b/MiniMock-1.2.8.tar.gz new file mode 100644 index 0000000..0f2c732 --- /dev/null +++ b/MiniMock-1.2.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fdfdfeadf0fc781d0592a1b90d2fcc11581f682ff7cba6201cfdb15c3ea5a4c +size 13217 diff --git a/python-MiniMock.changes b/python-MiniMock.changes index 4b9e2bf..c400b7b 100644 --- a/python-MiniMock.changes +++ b/python-MiniMock.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 29 12:29:43 UTC 2013 - dmueller@suse.com + +- Update to 1.2.8: + * add python 3.x support + ------------------------------------------------------------------- Sun May 27 07:58:11 UTC 2012 - highwaystar.ru@gmail.com diff --git a/python-MiniMock.spec b/python-MiniMock.spec index 6257377..f080d0d 100644 --- a/python-MiniMock.spec +++ b/python-MiniMock.spec @@ -1,7 +1,7 @@ # # spec file for package python-MiniMock # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,9 @@ # - Name: python-MiniMock -Version: 1.2.7 -Release: 1 +Version: 1.2.8 +Release: 0 Url: http://pypi.python.org/pypi/MiniMock Summary: The simplest possible mock library License: MIT @@ -45,7 +44,6 @@ When using doctest, mock objects can be very simple. %prep %setup -q -n MiniMock-%{version} -rm docs/.changelog.rst.un~ # Remove junk %build python setup.py build diff --git a/python3-MiniMock.changes b/python3-MiniMock.changes index 0155b17..89ea8e9 100644 --- a/python3-MiniMock.changes +++ b/python3-MiniMock.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 29 12:29:43 UTC 2013 - dmueller@suse.com + +- Update to 1.2.8: + * add python 3.x support + ------------------------------------------------------------------- Fri Nov 30 14:04:52 UTC 2012 - toddrme2178@gmail.com diff --git a/python3-MiniMock.spec b/python3-MiniMock.spec index 2f7a483..71b5fbb 100644 --- a/python3-MiniMock.spec +++ b/python3-MiniMock.spec @@ -1,7 +1,7 @@ # # spec file for package python3-MiniMock # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,9 @@ # - Name: python3-MiniMock -Version: 1.2.7 -Release: 1 +Version: 1.2.8 +Release: 0 Url: http://pypi.python.org/pypi/MiniMock Summary: The simplest possible mock library License: MIT @@ -27,8 +26,8 @@ Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/M/MiniMock/MiniMock-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python3 +BuildRequires: python3-2to3 BuildRequires: python3-devel -BuildRequires: python3-2to3 BuildRequires: python3-distribute Provides: python3-minimock = %{version} #TODO: Change back to '<' after version update: From b4f99379e05b59f8c65bfce2a942f3fc0ec1c2841cab297240dd69b42745b095 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 3 May 2013 09:41:42 +0000 Subject: [PATCH 2/2] - Fixed the obsoletes to '<' after last version update - Provides/obsoletes for python3-minimock is useless, that package never existed - Removing __pycache__ is actually wrong - "-rm docs/.changelog.rst.un~ # Remove junk" was bogus - No need to buildrequire python3, usually you only need that when requiring the _ssl module (as Jan if in doubt) - No need to buildrequire python3-2to3, it's in python3-devel nowadays OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-MiniMock?expand=0&rev=13 --- python-MiniMock.changes | 5 +++++ python-MiniMock.spec | 15 ++++++--------- python3-MiniMock.changes | 11 +++++++++++ python3-MiniMock.spec | 17 +++-------------- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/python-MiniMock.changes b/python-MiniMock.changes index c400b7b..5ad7a9e 100644 --- a/python-MiniMock.changes +++ b/python-MiniMock.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 3 09:26:17 UTC 2013 - speilicke@suse.com + +- Fixed the obsoletes to '<' after last version update + ------------------------------------------------------------------- Mon Apr 29 12:29:43 UTC 2013 - dmueller@suse.com diff --git a/python-MiniMock.spec b/python-MiniMock.spec index f080d0d..cce4988 100644 --- a/python-MiniMock.spec +++ b/python-MiniMock.spec @@ -27,16 +27,13 @@ Source: http://pypi.python.org/packages/source/M/MiniMock/MiniMock-%{ver BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-distribute -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +Provides: python-minimock = %{version} +Obsoletes: python-minimock < %{version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif -Provides: python-minimock = %{version} -#TODO: Change back to '<' after version update: -Obsoletes: python-minimock <= %{version} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description Minimock is a simple library for doing Mock objects with doctest. @@ -53,7 +50,7 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) -%doc docs/* +%doc docs/license.txt %{python_sitelib}/minimock.py* %{python_sitelib}/MiniMock-%{version}-py%{py_ver}.egg-info diff --git a/python3-MiniMock.changes b/python3-MiniMock.changes index 89ea8e9..76b9f74 100644 --- a/python3-MiniMock.changes +++ b/python3-MiniMock.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri May 3 09:27:12 UTC 2013 - speilicke@suse.com + +- Provides/obsoletes for python3-minimock is useless, that package + never existed +- Removing __pycache__ is actually wrong +- "-rm docs/.changelog.rst.un~ # Remove junk" was bogus +- No need to buildrequire python3, usually you only need that when + requiring the _ssl module (as Jan if in doubt) +- No need to buildrequire python3-2to3, it's in python3-devel nowadays + ------------------------------------------------------------------- Mon Apr 29 12:29:43 UTC 2013 - dmueller@suse.com diff --git a/python3-MiniMock.spec b/python3-MiniMock.spec index 71b5fbb..b06c881 100644 --- a/python3-MiniMock.spec +++ b/python3-MiniMock.spec @@ -25,14 +25,8 @@ License: MIT Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/M/MiniMock/MiniMock-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python3 -BuildRequires: python3-2to3 BuildRequires: python3-devel BuildRequires: python3-distribute -Provides: python3-minimock = %{version} -#TODO: Change back to '<' after version update: -Obsoletes: python3-minimock <= %{version} -Requires: python(abi) = %{py3_ver} BuildArch: noarch %description @@ -41,22 +35,17 @@ When using doctest, mock objects can be very simple. %prep %setup -q -n MiniMock-%{version} -rm docs/.changelog.rst.un~ # Remove junk +2to3 -w -n . %build -2to3 -w -n . python3 setup.py build %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -if [ -d "%{buildroot}%{python3_sitelib}/__pycache__" ]; then - rm -r %{buildroot}%{python3_sitelib}/__pycache__ -fi %files %defattr(-,root,root,-) -%doc docs/* -%{python3_sitelib}/minimock.py* -%{python3_sitelib}/MiniMock-%{version}-py%{py3_ver}.egg-info +%doc docs/license.txt +%{python3_sitelib}/* %changelog