Hello community,

here is the log from the commit of package python-kid for openSUSE:Factory 
checked in at 2018-06-19 12:02:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-kid (Old)
 and      /work/SRC/openSUSE:Factory/.python-kid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-kid"

Tue Jun 19 12:02:15 2018 rev:7 rq:616913 version:0.9.6

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-kid/python-kid.changes    2017-07-11 
08:28:07.480157791 +0200
+++ /work/SRC/openSUSE:Factory/.python-kid.new/python-kid.changes       
2018-06-19 12:02:19.653008097 +0200
@@ -1,0 +2,10 @@
+Thu Jun 14 16:46:05 UTC 2018 - [email protected]
+
+- Clean SPEC file
+
+-------------------------------------------------------------------
+Thu Aug 24 13:43:47 UTC 2017 - [email protected]
+
+- singlespec auto-conversion
+
+-------------------------------------------------------------------
@@ -225,0 +236 @@
+

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-kid.spec ++++++
--- /var/tmp/diff_new_pack.eXFyfP/_old  2018-06-19 12:02:20.780966217 +0200
+++ /var/tmp/diff_new_pack.eXFyfP/_new  2018-06-19 12:02:20.788965920 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package python-kid
 #
-# Copyright (c) 2017 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
@@ -11,57 +11,79 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-#
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-Name:           python-kid
+
+%define skip_python3 1
+%define modname kid
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+
+Name:           python-%{modname}
 Version:        0.9.6
 Release:        0
-Url:            http://www.kid-templating.org/
 Summary:        XML template language
+# The site below is mentioned in the tarball itself, but it is now used
+# by some other organization.
 License:        MIT
 Group:          Development/Languages/Python
-Source:         
https://files.pythonhosted.org/packages/source/k/kid/kid-%{version}.tar.gz
-Patch0:         kid-setuptools.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-devel
-BuildRequires:  python-nose
+URL:            http://www.kid-templating.org/
+Source:         
https://files.pythonhosted.org/packages/source/k/%{modname}/%{modname}-%{version}.tar.gz
+Patch0:         %{modname}-setuptools.patch
+BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 BuildArch:      noarch
-Provides:       python2-kid = %{name}
+%python_subpackages
 
 %description
 A simple and pythonic XML template language.
 
+%package doc
+Summary:        Documentation for %{name}
+Group:          Documentation/HTML
+BuildArch:      noarch
+
+%description doc
+This package contains documentation for %{name}.
+
 %prep
-%setup -q -n kid-%{version}
+%setup -q -n %{modname}-%{version}
 %patch0 -p1
 
 # Fix wrong-script-interpreter
-sed -i "s|#!/usr/bin/env python|#!/usr/bin/python|" bin/kid
-sed -i "s|#!/usr/bin/env python|#!/usr/bin/python|" bin/kidc
-sed -i "s|#!/usr/bin/env python|#!/usr/bin/python|" 
examples/cgi/kid_handler.cgi
+sed -i "s|#!%{_bindir}/env python|#!%{_bindir}/python|" bin/kid
+sed -i "s|#!%{_bindir}/env python|#!%{_bindir}/python|" bin/kidc
+sed -i "s|#!%{_bindir}/env python|#!%{_bindir}/python|" 
examples/cgi/kid_handler.cgi
+
+# remove shebang from non-executable scripts
+sed -i -e '/\/usr\/bin\/env\s\+python/d' kid/{compile,release,run}.py
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
 # Install /usr/bin scripts by hand because setuptools support was patched away 
a while ago
 # We can't just revert that because rpm can't update files to dirs and vice 
versa
 install -d %{buildroot}%{_bindir}
 install -m0755 bin/kid{,c} %{buildroot}%{_bindir}
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-nosetests
+rm -rf {dist,build}
+%python_exec run_tests.py
+
+%files %{python_files}
+%license COPYING
+%doc ChangeLog README
+%{_bindir}/%{modname}*
+%{python_sitelib}/%{modname}*
 
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README
+%files doc
 %doc doc/html/
 %doc examples/
-%{_bindir}/kid
-%{_bindir}/kidc
-%{python_sitelib}/*
 
 %changelog

++++++ kid-setuptools.patch ++++++
--- /var/tmp/diff_new_pack.eXFyfP/_old  2018-06-19 12:02:20.832964287 +0200
+++ /var/tmp/diff_new_pack.eXFyfP/_new  2018-06-19 12:02:20.836964137 +0200
@@ -1,7 +1,6 @@
-diff -ru a/setup.py b/setup.py
---- a/setup.py 2007-07-16 13:02:49.000000000 +0200
-+++ b/setup.py 2012-02-01 12:48:46.594950210 +0100
-@@ -1,14 +1,10 @@
+--- a/setup.py
++++ b/setup.py
+@@ -1,9 +1,5 @@
  #!/usr/bin/env python
  
 -# bootstrap setuptools if necessary
@@ -11,10 +10,3 @@
  import os
  
  execfile(os.path.join("kid", "release.py"))
- 
--from setuptools import setup, find_packages
-+from distutils.core import setup
- 
- setup(
-     name="kid",
-Only in b: .setup.py.swp


Reply via email to