From 00d691f78efdec99aca91805760b92c609708585f3e6c89cd1097cdfab3e5be8 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Mon, 8 May 2023 07:44:04 +0000 Subject: [PATCH] Accepting request 1085284 from home:sbluhm:branches:systemsmanagement:Uyuni:Master:Other:EL - Adapted to build on Enterprise Linux. OBS-URL: https://build.opensuse.org/request/show/1085284 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ws-jaxme?expand=0&rev=38 --- ws-jaxme.changes | 5 +++++ ws-jaxme.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ws-jaxme.changes b/ws-jaxme.changes index c2b7918..3268746 100644 --- a/ws-jaxme.changes +++ b/ws-jaxme.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 5 20:16:22 UTC 2023 - Stefan Bluhm + +- Adapted to build on Enterprise Linux. + ------------------------------------------------------------------- Wed Mar 30 09:25:19 UTC 2022 - Fridrich Strba diff --git a/ws-jaxme.spec b/ws-jaxme.spec index 9edebce..a20f0f7 100644 --- a/ws-jaxme.spec +++ b/ws-jaxme.spec @@ -35,7 +35,11 @@ BuildRequires: ant >= 1.6 BuildRequires: ant-apache-resolver BuildRequires: antlr BuildRequires: apache-commons-codec +%if 0%{?rhel} +BuildRequires: docbook-style-xsl +%else BuildRequires: docbook-xsl-stylesheets +%endif BuildRequires: glassfish-jaxb-api BuildRequires: hsqldb BuildRequires: java-devel >= 1.8 @@ -129,7 +133,11 @@ ant Docs.all \ -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \ -Dbuild.sysclasspath=first \ -Ddocbook.home=%{_datadir}/xml/docbook \ +%if 0%{?rhel} + -Ddocbookxsl.home=%{_datadir}/sgml/docbook/xsl-stylesheets +%else -Ddocbookxsl.home=%{_datadir}/xml/docbook/stylesheet/nwalsh/current +%endif %install install -dm 755 %{buildroot}%{_javadir}/%{base_name}