Update to last successful build

c7dd256efbcc0a1f4771eb6f0fefa3df7f080c30 Merge pull request #3 from bnavigator/multiple-python3-flavors
4154576ce2fdf4157e1ca3e05f66427d40d53dc6 python_expand to support multiple python3 flavors

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/zypp-plugin?expand=0&rev=25
This commit is contained in:
ZYpp Developers 2020-10-28 14:56:31 +00:00 committed by Git OBS Bridge
parent d8637283d4
commit 88e607c71a
3 changed files with 26 additions and 7 deletions

BIN
zypp-plugin-0.6.3.tar.bz2 (Stored with Git LFS)

Binary file not shown.

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 23 21:31:23 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
- singlespec in Tumbleweed must support multiple python3 flavors
in the future gh#openSUSE/python-rpm-macros#66
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 13 14:51:18 CET 2018 - ma@suse.com Tue Mar 13 14:51:18 CET 2018 - ma@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package zypp-plugin # spec file for package zypp-plugin
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -22,15 +22,16 @@ Name: zypp-plugin
Version: 0.6.3 Version: 0.6.3
Release: 0 Release: 0
Summary: Helper that makes writing ZYpp plugins easier Summary: Helper that makes writing ZYpp plugins easier
License: GPL-2.0 License: GPL-2.0-only
Group: System/Packages Group: System/Packages
Url: https://github.com/openSUSE/zypp-plugin URL: https://github.com/openSUSE/zypp-plugin
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
BuildArch: noarch BuildArch: noarch
%if %{singlespec_py3} %if %{singlespec_py3}
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
Requires: python-base Requires: python-base
# provide old names for py2 package # provide old names for py2 package
@ -62,6 +63,16 @@ and implementing the commands you want to respond to as python methods.
: :
%install %install
%if %{singlespec_py3}
%{python_expand #
mkdir -p %{buildroot}%{$python_sitelib}
install -m 0644 python/zypp_plugin.py %{buildroot}%{$python_sitelib}/zypp_plugin.py
# TODO: replace by $python_compileall as soon as it is available sr#843481
$python -m compileall %{buildroot}%{$python_sitelib}
$python -O -m compileall %{buildroot}%{$python_sitelib}
%fdupes %{buildroot}%{$python_sitelib}
}
%else
%if 0%{?have_python2} %if 0%{?have_python2}
mkdir -p %{buildroot}%{python_sitelib} mkdir -p %{buildroot}%{python_sitelib}
install -m 0644 python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py install -m 0644 python/zypp_plugin.py %{buildroot}%{python_sitelib}/zypp_plugin.py
@ -72,11 +83,13 @@ mkdir -p %{buildroot}%{python3_sitelib}
install -m 0644 python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py install -m 0644 python/zypp_plugin.py %{buildroot}%{python3_sitelib}/zypp_plugin.py
%py3_compile -O %{buildroot}/%{python3_sitelib} %py3_compile -O %{buildroot}/%{python3_sitelib}
%endif %endif
%endif
%if %{singlespec_py3} %if %{singlespec_py3}
%files %{python_files} %files %{python_files}
%doc COPYING %doc COPYING
%{python_sitelib}/* %{python_sitelib}/zypp_plugin*
%pycache_only %{python_sitelib}/__pycache__/*
### ---------------------------------------- ### ----------------------------------------
### SLE-12* and even older ### SLE-12* and even older