This commit is contained in:
parent
a8f08fa3e2
commit
658c4d5f7a
@ -1,8 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 26 16:43:02 UTC 2021 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Don't use SUSE patches when not building on any of SUSE platforms
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 25 16:27:58 UTC 2021 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
|
@ -65,6 +65,7 @@ BuildRequires: %{python_module pytest}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: %{python_module six}
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildArch: noarch
|
||||
%if 0%{?suse_version} >= 1550
|
||||
# TW: generate subpackages for every python3 flavor
|
||||
%define python_subpackage_only 1
|
||||
@ -77,9 +78,6 @@ BuildRequires: python-rpm-macros
|
||||
Provides: mvn(com.sun:tools) = SYSTEM
|
||||
Provides: mvn(sun.jdk:jconsole) = SYSTEM
|
||||
%endif
|
||||
%if ! 0%{?suse_version} || %{with python}
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
|
||||
%description
|
||||
This package provides macros and scripts to support Java packaging.
|
||||
@ -152,13 +150,7 @@ This package provides non-essential macros and scripts to support Java packaging
|
||||
|
||||
%prep
|
||||
%setup -q -n javapackages-%{version}
|
||||
%if 0%{?suse_version}
|
||||
%patch0 -p1
|
||||
%endif
|
||||
%patch1 -p1
|
||||
%if 0%{?suse_version}
|
||||
%patch2 -p1
|
||||
%endif
|
||||
%autopatch -p1
|
||||
|
||||
# The usr/lib is hardcoded in configuration files too
|
||||
new_dir=$(echo %{_libdir} | sed 's#/##')
|
||||
|
Loading…
x
Reference in New Issue
Block a user