From 7f0791035c3dc011a8f7fa5f5285ea39e3069fb1fa1de56cd9a8413c0019332f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 16 Dec 2017 07:59:10 +0000 Subject: [PATCH 1/2] Accepting request 557429 from devel:languages:python:singlespec-staging - singlespec auto-conversion - Include in SLE 12 (FATE #316168) - Initial release OBS-URL: https://build.opensuse.org/request/show/557429 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-crcmod?expand=0&rev=5 --- python-crcmod.changes | 6 ++++++ python-crcmod.spec | 22 +++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/python-crcmod.changes b/python-crcmod.changes index a7923a5..9ca9a74 100644 --- a/python-crcmod.changes +++ b/python-crcmod.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 24 13:35:06 UTC 2017 - jmatejek@suse.com + +- singlespec auto-conversion + ------------------------------------------------------------------- Fri Feb 14 11:47:05 UTC 2014 - rschweikert@suse.com @@ -8,3 +13,4 @@ Sun Nov 27 00:58:43 UTC 2011 - jfunk@funktronics.ca - Initial release + diff --git a/python-crcmod.spec b/python-crcmod.spec index bd077ec..2ff75be 100644 --- a/python-crcmod.spec +++ b/python-crcmod.spec @@ -1,7 +1,7 @@ # # spec file for package python-crcmod # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,24 @@ # +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-crcmod Version: 1.7 Release: 0 -Url: http://crcmod.sourceforge.net/ Summary: CRC Generator License: MIT Group: Development/Languages/Python -Source: http://pypi.python.org/packages/source/c/crcmod/crcmod-%{version}.tar.gz +Url: http://crcmod.sourceforge.net/ +Source: https://files.pythonhosted.org/packages/source/c/crcmod/crcmod-%{version}.tar.gz +BuildRequires: %{python_module devel} +BuildRequires: python-rpm-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-devel %if 0%{?suse_version} %py_requires %endif -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%python_subpackages %description The software in this package is a Python module for generating objects that @@ -50,12 +53,13 @@ C/C++ source code that can be used in another application. %setup -q -n crcmod-%{version} %build -CFLAGS="%{optflags}" python setup.py build +export CFLAGS="%{optflags}" +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_install -%files +%files %{python_files} %defattr(-,root,root,-) %doc LICENSE README changelog docs/html %{python_sitearch}/* From c975bd0c2ee924229e65e6875cfbf5435aec425ab61819febc2e6b5b5f3b4912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 16 Dec 2017 08:15:59 +0000 Subject: [PATCH 2/2] Accepting request 557608 from home:pluskalm:branches:devel:languages:python - Cleanup spec file - Use fdupes - Do not bundle html doc OBS-URL: https://build.opensuse.org/request/show/557608 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-crcmod?expand=0&rev=6 --- python-crcmod.changes | 7 +++++++ python-crcmod.spec | 14 ++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/python-crcmod.changes b/python-crcmod.changes index 9ca9a74..f956211 100644 --- a/python-crcmod.changes +++ b/python-crcmod.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 16 08:07:07 UTC 2017 - mpluskal@suse.com + +- Cleanup spec file +- Use fdupes +- Do not bundle html doc + ------------------------------------------------------------------- Thu Aug 24 13:35:06 UTC 2017 - jmatejek@suse.com diff --git a/python-crcmod.spec b/python-crcmod.spec index 2ff75be..3ce6beb 100644 --- a/python-crcmod.spec +++ b/python-crcmod.spec @@ -16,8 +16,6 @@ # -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-crcmod Version: 1.7 @@ -27,12 +25,9 @@ License: MIT Group: Development/Languages/Python Url: http://crcmod.sourceforge.net/ Source: https://files.pythonhosted.org/packages/source/c/crcmod/crcmod-%{version}.tar.gz -BuildRequires: %{python_module devel} +BuildRequires: %{python_module base} +BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} -%py_requires -%endif %python_subpackages %description @@ -53,15 +48,14 @@ C/C++ source code that can be used in another application. %setup -q -n crcmod-%{version} %build -export CFLAGS="%{optflags}" %python_build %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitearch}/crcmod %files %{python_files} -%defattr(-,root,root,-) -%doc LICENSE README changelog docs/html +%doc LICENSE README changelog %{python_sitearch}/* %changelog