1
0

Accepting request 832783 from home:dimstar:Factory

Fix build of javapackages-tools:extras in Staging:A

OBS-URL: https://build.opensuse.org/request/show/832783
OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=77
This commit is contained in:
Fridrich Strba 2020-09-07 14:30:29 +00:00 committed by Git OBS Bridge
parent f9325caf96
commit c7deb35513
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Sep 7 12:50:32 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- when building extra flavor, BuildRequire javapackages-filesystem:
/etc/java is being cleaned out of the filesystems package.
-------------------------------------------------------------------
Thu Jul 16 07:23:37 UTC 2020 - Fridrich Strba <fstrba@suse.com>

View File

@ -19,8 +19,7 @@
%{!?_rpmmacrodir:%global _rpmmacrodir %{_rpmconfigdir}/macros.d}
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "extras"
%bcond_without python
%else
%bcond_without python%else
%bcond_with python
%endif
%if %{with python}
@ -48,7 +47,11 @@ BuildRequires: fdupes
BuildRequires: perl
BuildRequires: rpm
BuildRequires: xmlto
%if "%{flavor}" == "extras"
BuildRequires: javapackages-filesystem
%else
Requires: javapackages-filesystem = %{version}-%{release}
%endif
# Used on too many places
Provides: jpackage-utils = %{version}
Obsoletes: %{name}-doc