Hello community,
here is the log from the commit of package python-storm for openSUSE:Factory
checked in at 2018-06-08 23:13:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-storm (Old)
and /work/SRC/openSUSE:Factory/.python-storm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-storm"
Fri Jun 8 23:13:00 2018 rev:8 rq:613319 version:0.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-storm/python-storm.changes
2013-11-18 10:54:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-storm.new/python-storm.changes
2018-06-08 23:13:02.429318628 +0200
@@ -1,0 +2,9 @@
+Wed May 30 21:08:14 UTC 2018 - mc...@suse.com
+
+- Clean up SPEC file and converstion to the single spec (py3k switched
+ off, though)
+- Don't package tests/ directory
+- New patch, storm-0.20-remove-ez_setup.patch ... ez_setup breaks py3k
+ and it is unnecessary, so I just remove it from setup.py
+
+-------------------------------------------------------------------
Old:
----
storm-0.20.tar.bz2
New:
----
storm-0.20-remove-ez_setup.patch
storm-0.20.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-storm.spec ++++++
--- /var/tmp/diff_new_pack.Q6VDRY/_old 2018-06-08 23:13:03.049296240 +0200
+++ /var/tmp/diff_new_pack.Q6VDRY/_new 2018-06-08 23:13:03.053296095 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-storm
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX 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,21 +16,26 @@
#
-Name: python-storm
+%define skip_python3 1
+
+%define modname storm
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+
+Name: python-%{modname}
Version: 0.20
Release: 0
-Url: http://storm.canonical.com/
Summary: An object-relational mapper (ORM) for Python
-License: LGPL-2.0+
+License: LGPL-2.0-or-later
Group: Development/Languages/Python
-Source:
https://pypi.python.org/packages/source/s/storm/storm-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: python-devel
-BuildRequires: python-setuptools
-Requires: python-storm-backend = %{version}
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%endif
+URL: https://storm.canonical.com
+Source:
https://files.pythonhosted.org/packages/source/s/storm/storm-%{version}.tar.gz
+Patch: storm-0.20-remove-ez_setup.patch
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools}
+BuildRequires: fdupes
+BuildRequires: python-rpm-macros
+Requires: python-%{modname}-backend = %{version}
+%python_subpackages
%description
Storm is an object-relational mapper (ORM) for Python developed at
@@ -63,6 +68,8 @@
Group: Development/Languages/Python
Requires: %{name} = %{version}
Requires: python-django
+Provides: %{python_module %{modname}-backend = %{version}}
+Provides: %{python_module django = %{version}}
%description django
The python-storm-django package contains the Django support for the Storm ORM.
@@ -70,7 +77,8 @@
%package mysql
Summary: MySQL backend for the Storm ORM
Group: Development/Languages/Python
-Provides: %{name}-backend = %{version}
+Provides: %{python_module %{modname}-backend = %{version}}
+Provides: %{python_module mysql = %{version}}
Requires: %{name} = %{version}
%description mysql
@@ -79,7 +87,8 @@
%package postgresql
Summary: PostgreSQL backend for the Storm ORM
Group: Development/Languages/Python
-Provides: %{name}-backend = %{version}
+Provides: %{python_module %{modname}-backend = %{version}}
+Provides: %{python_module postgresql = %{version}}
Requires: %{name} = %{version}
Requires: python-psycopg2
@@ -92,43 +101,43 @@
Group: Development/Languages/Python
Requires: %{name} = %{version}
Requires: python-Twisted
+Provides: %{python_module twisted = %{version}}
%description twisted
This package contains the Django support for the Storm ORM.
%prep
-%setup -q -n storm-%{version}
+%setup -q -n %{modname}-%{version}
+%patch -p1
%build
-python setup.py build
+%python_build
%install
-python setup.py install --root=%{buildroot} --prefix=%{_prefix}
+%python_install
+%python_expand rm -rfv %{buildroot}%{$python_sitearch}/tests
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
+
+%files %{python_files}
+%license LICENSE
+%doc NEWS README TODO tests/tutorial.txt
+%{python_sitearch}/%{modname}*
+%exclude %{python_sitearch}/%{modname}/cextensions.c
+%exclude %{python_sitearch}/%{modname}/databases/mysql.*
+%exclude %{python_sitearch}/%{modname}/databases/postgres.*
+%exclude %{python_sitearch}/%{modname}/django
+%exclude %{python_sitearch}/%{modname}/twisted
+
+%files %{python_files django}
+%{python_sitearch}/%{modname}/django
+
+%files %{python_files mysql}
+%{python_sitearch}/%{modname}/databases/mysql.*
+
+%files %{python_files postgresql}
+%{python_sitearch}/%{modname}/databases/postgres.*
-%files
-%defattr(-,root,root,-)
-%doc LICENSE NEWS README TODO tests/tutorial.txt
-%{python_sitearch}/*
-%exclude %{python_sitearch}/storm/cextensions.c
-%exclude %{python_sitearch}/storm/databases/mysql.*
-%exclude %{python_sitearch}/storm/databases/postgres.*
-%exclude %{python_sitearch}/storm/django
-%exclude %{python_sitearch}/storm/twisted
-
-%files django
-%defattr(-,root,root,-)
-%{python_sitearch}/storm/django
-
-%files mysql
-%defattr(-,root,root,-)
-%{python_sitearch}/storm/databases/mysql.*
-
-%files postgresql
-%defattr(-,root,root,-)
-%{python_sitearch}/storm/databases/postgres.*
-
-%files twisted
-%defattr(-,root,root,-)
-%{python_sitearch}/storm/twisted
+%files %{python_files twisted}
+%{python_sitearch}/%{modname}/twisted
%changelog
++++++ storm-0.20-remove-ez_setup.patch ++++++
--- a/setup.py
+++ b/setup.py
@@ -2,9 +2,6 @@
import os
import re
-import ez_setup
-ez_setup.use_setuptools()
-
from setuptools import setup, Extension, find_packages
