dmach/osc-fork
1
0
Fork 0
forked from pool/osc
Code Pull Requests Activity

- simplify "BuildArch:" decission if statements. (Avoid double

Browse Source 
BuildArch lines)
- Fedora29: m2crypto for python3 is named python3-m2crypto now

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=283
This commit is contained in:
Marco Strigl 2019-04-24 09:57:40 +00:00 committed by Git OBS Bridge
parent d8822885e7
commit 16551915bf
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Apr 24 09:55:14 UTC 2019 - Marco Strigl <marco.strigl@suse.com>
- simplify "BuildArch:" decission if statements. (Avoid double
BuildArch lines)
- Fedora29: m2crypto for python3 is named python3-m2crypto now
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 18 12:45:04 UTC 2019 - Marco Strigl <marco.strigl@suse.com> Thu Apr 18 12:45:04 UTC 2019 - Marco Strigl <marco.strigl@suse.com>

11
osc.spec
View File

@ -55,10 +55,10 @@ BuildRequires: rpm-python
Requires: rpm-python Requires: rpm-python
%endif %endif
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1120
%if 0%{?suse_version} >= 1120
BuildArch: noarch BuildArch: noarch
%endif %endif
%if 0%{?suse_version}
Requires: %{use_python} Requires: %{use_python}
Recommends: %{use_python}-progressbar Recommends: %{use_python}-progressbar
BuildRequires: %{use_python}-xml BuildRequires: %{use_python}-xml
@ -83,8 +83,6 @@ Recommends: obs-service-download_files
Recommends: obs-service-format_spec_file Recommends: obs-service-format_spec_file
Recommends: obs-service-source_validator Recommends: obs-service-source_validator
%endif %endif
%else
BuildArch: noarch
%endif %endif
# needed for storing credentials in kwallet/gnome-keyring # needed for storing credentials in kwallet/gnome-keyring
%if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion} %if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion}
@ -109,9 +107,14 @@ BuildRequires: python-m2crypto > 0.19
Requires: python-m2crypto > 0.19 Requires: python-m2crypto > 0.19
%endif %endif
%else %else
%if 0%{?fedora_version} >= 29
BuildRequires: python3-m2crypto
Requires: python3-m2crypto
%else
BuildRequires: m2crypto > 0.19 BuildRequires: m2crypto > 0.19
Requires: m2crypto > 0.19 Requires: m2crypto > 0.19
%endif %endif
%endif
%if %{with python3} %if %{with python3}
%define python_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %define python_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
%else %else