From c7deb35513b71e3c59f1c835a2ca071e03a13d93c5866f2d068e19cb3033165d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 7 Sep 2020 14:30:29 +0000 Subject: [PATCH] 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 --- javapackages-tools.changes | 6 ++++++ javapackages-tools.spec | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 4ea7a71..3692b7b 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 7 12:50:32 UTC 2020 - Dominique Leuenberger + +- 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 diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 31b995f..566ee8d 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -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