From e0c3c6bd643dd56e0972714d3f77f468a68aabddf3fe769c12dde38858c8e421 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 8 Apr 2019 11:40:03 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/velocity?expand=0&rev=34 --- velocity.changes | 6 ++++++ velocity.spec | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/velocity.changes b/velocity.changes index 4acc2b1..bbd0c40 100644 --- a/velocity.changes +++ b/velocity.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 8 11:39:35 UTC 2019 - Fridrich Strba + +- Do not depend on the apache-parent, since we are not building + using Maven. + ------------------------------------------------------------------- Thu Feb 14 08:35:38 UTC 2019 - Fridrich Strba diff --git a/velocity.spec b/velocity.spec index 5c707dd..2b32e98 100644 --- a/velocity.spec +++ b/velocity.spec @@ -29,7 +29,6 @@ Patch0: velocity-build_xml.patch BuildRequires: ant >= 1.6.5 BuildRequires: ant-junit BuildRequires: antlr -BuildRequires: apache-parent BuildRequires: avalon-logkit BuildRequires: commons-collections BuildRequires: commons-lang @@ -44,7 +43,6 @@ BuildRequires: oro BuildRequires: plexus-classworlds BuildRequires: servletapi4 BuildRequires: werken-xpath -Requires: apache-parent Requires: avalon-logkit Requires: commons-collections Requires: commons-lang @@ -164,6 +162,10 @@ for j in $(find . -name "*.jar" | grep -v /test/); do done %patch0 -b .sav0 +cp %{SOURCE1} pom.xml + +%pom_remove_parent pom.xml + %build #export JAVA_HOME=%{_jvmdir}/java-1.5.0 # Use servletapi4 instead of servletapi5 in CLASSPATH @@ -204,7 +206,7 @@ install -d -m 755 %{buildroot}%{_javadir} install -p -m 644 bin/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 %{SOURCE1} \ +install -pm 644 pom.xml \ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap -a velocity:velocity