pool/javapackages-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=93

Browse Source
This commit is contained in:
Fridrich Strba 2021-07-27 06:13:54 +00:00 committed by Git OBS Bridge
parent a8f08fa3e2
commit 658c4d5f7a
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
javapackages-tools.changes
View File

@ -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> Thu Mar 25 16:27:58 UTC 2021 - Ben Greiner <code@bnavigator.de>

12
javapackages-tools.spec
View File

@ -65,6 +65,7 @@ BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools} BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six} BuildRequires: %{python_module six}
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildArch: noarch
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
# TW: generate subpackages for every python3 flavor # TW: generate subpackages for every python3 flavor
%define python_subpackage_only 1 %define python_subpackage_only 1
@ -77,9 +78,6 @@ BuildRequires: python-rpm-macros
Provides: mvn(com.sun:tools) = SYSTEM Provides: mvn(com.sun:tools) = SYSTEM
Provides: mvn(sun.jdk:jconsole) = SYSTEM Provides: mvn(sun.jdk:jconsole) = SYSTEM
%endif %endif
%if ! 0%{?suse_version} || %{with python}
BuildArch: noarch
%endif
%description %description
This package provides macros and scripts to support Java packaging. 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 %prep
%setup -q -n javapackages-%{version} %setup -q -n javapackages-%{version}
%if 0%{?suse_version} %autopatch -p1
%patch0 -p1
%endif
%patch1 -p1
%if 0%{?suse_version}
%patch2 -p1
%endif
# The usr/lib is hardcoded in configuration files too # The usr/lib is hardcoded in configuration files too
new_dir=$(echo %{_libdir} | sed 's#/##') new_dir=$(echo %{_libdir} | sed 's#/##')