From eb1bb78f34025c1e15fe882305aa0c23d08ba12acec37ccbb5b63233c6a0cec8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 19 Apr 2022 07:53:34 +0000 Subject: [PATCH] Accepting request 970372 from home:sbluhm:branches:systemsmanagement:Uyuni:Master:Other - Added build capability for Enterprise Linux 9. OBS-URL: https://build.opensuse.org/request/show/970372 OBS-URL: https://build.opensuse.org/package/show/Java:packages/velocity-master?expand=0&rev=4 --- velocity-master.changes | 5 +++++ velocity-master.spec | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/velocity-master.changes b/velocity-master.changes index 7c23809..c8f0361 100644 --- a/velocity-master.changes +++ b/velocity-master.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 13 09:38:42 UTC 2022 - Stefan Bluhm + +- Added build capability for Enterprise Linux 9. + ------------------------------------------------------------------- Thu Dec 2 11:28:49 UTC 2021 - Fridrich Strba diff --git a/velocity-master.spec b/velocity-master.spec index ab37cc5..f1cb7e3 100644 --- a/velocity-master.spec +++ b/velocity-master.spec @@ -25,7 +25,11 @@ Group: Development/Libraries/Java Source0: https://repo1.maven.org/maven2/org/apache/velocity/%{name}/%{version}/%{name}-%{version}.pom Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: javapackages-local +%if 0%{?rhel} >= 9 +BuildRequires: xmvn-tools +%else BuildRequires: xmvn-resolve +%endif BuildRequires: mvn(org.apache:apache:pom:) BuildArch: noarch @@ -36,13 +40,20 @@ Master POM for Velocity. %setup -q -c -T cp %{SOURCE0} pom.xml cp %{SOURCE1} LICENSE +%if 0%{?rhel} +%mvn_artifact pom.xml +%endif %build %install +%if 0%{?rhel} +%mvn_install +%else install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom +%endif %files -f .mfiles %license LICENSE