SHA256
1
0
forked from pool/protobuf

Accepting request 849909 from home:bnavigator:branches:devel:tools:building

- Fix the python subpackage generation
  gh#openSUSE/python-rpm-macros#79
- Support multiple python3 flavors gh#openSUSE/python-rpm-macros#66

OBS-URL: https://build.opensuse.org/request/show/849909
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=97
This commit is contained in:
Martin Pluskal
2020-11-24 07:31:34 +00:00
committed by Git OBS Bridge
parent ca57d7370f
commit cf85ecfc62
2 changed files with 36 additions and 4 deletions

View File

@@ -136,6 +136,17 @@ Sun Nov 22 00:56:06 UTC 2020 - John Vandenberg <jayvdb@gmail.com>
performance (the legacy generated code will still work, but might incur
a slight performance penalty).
-------------------------------------------------------------------
Sun Nov 22 00:21:40 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
- Fix the python subpackage generation
gh#openSUSE/python-rpm-macros#79
-------------------------------------------------------------------
Sat Nov 14 23:33:17 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
- Support multiple python3 flavors gh#openSUSE/python-rpm-macros#66
-------------------------------------------------------------------
Tue Jun 30 08:48:59 UTC 2020 - marec <marec@detebe.org>

View File

@@ -57,6 +57,16 @@ BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-local
%endif
%if 0%{?python38_version_nodots}
# if python multiflavor is in place yet, use it to generate subpackages
%define python_subpackage_only 1
%python_subpackages
%else
# same "defaults" for all distributions, used in files section
%define python_files() -n python3-%{**}
%define python_sitelib %{python3_sitelib}
%endif
%description
Protocol Buffers are a way of encoding structured data in an efficient yet
extensible format. Google uses Protocol Buffers for almost all of its internal
@@ -124,6 +134,16 @@ Requires: java >= 1.6.0
%description -n %{name}-java
This package contains the Java bindings for Google Protocol Buffers.
%if 0%{?python_subpackage_only}
%package -n python-%{name}
Summary: Python Bindings for Google Protocol Buffers
Group: Development/Libraries/Python
Requires: python-six >= 1.9
%description -n python-%{name}
This package contains the Python bindings for Google Protocol Buffers.
%else
%package -n python2-%{name}
Summary: Python2 Bindings for Google Protocol Buffers
Group: Development/Libraries/Python
@@ -141,6 +161,7 @@ Requires: python3-six >= 1.9
%description -n python3-%{name}
This package contains the Python bindings for Google Protocol Buffers.
%endif
%prep
%autosetup -n %{tarname}-%{version}
@@ -259,16 +280,16 @@ find %{buildroot}%{src_install_dir} -type f -name ".gitignore" -exec rm -f "{}"
%{_javadir}/%{name}.jar
%endif
%if %{with python2}
%if %{with python2} && ! 0%{?python_subpackage_only}
%files -n python2-%{name}
%license LICENSE
%{python2_sitelib}/*
%endif
%if %{with python3}
%files -n python3-%{name}
%if %{with python3} || ( %{with python2} && 0%{?python_subpackage_only} )
%files %{python_files %{name}}
%license LICENSE
%{python3_sitelib}/*
%{python_sitelib}/*
%endif
%changelog