pool/velocity
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/velocity?expand=0&rev=34

Browse Source
This commit is contained in:
Fridrich Strba 2019-04-08 11:40:03 +00:00 committed by Git OBS Bridge
parent 5e3713eeb6
commit e0c3c6bd64
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
velocity.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 8 11:39:35 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Do not depend on the apache-parent, since we are not building
using Maven.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 14 08:35:38 UTC 2019 - Fridrich Strba <fstrba@suse.com> Thu Feb 14 08:35:38 UTC 2019 - Fridrich Strba <fstrba@suse.com>

8
velocity.spec
View File

@ -29,7 +29,6 @@ Patch0: velocity-build_xml.patch
BuildRequires: ant >= 1.6.5 BuildRequires: ant >= 1.6.5
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: antlr BuildRequires: antlr
BuildRequires: apache-parent
BuildRequires: avalon-logkit BuildRequires: avalon-logkit
BuildRequires: commons-collections BuildRequires: commons-collections
BuildRequires: commons-lang BuildRequires: commons-lang
@ -44,7 +43,6 @@ BuildRequires: oro
BuildRequires: plexus-classworlds BuildRequires: plexus-classworlds
BuildRequires: servletapi4 BuildRequires: servletapi4
BuildRequires: werken-xpath BuildRequires: werken-xpath
Requires: apache-parent
Requires: avalon-logkit Requires: avalon-logkit
Requires: commons-collections Requires: commons-collections
Requires: commons-lang Requires: commons-lang
@ -164,6 +162,10 @@ for j in $(find . -name "*.jar" | grep -v /test/); do
done done
%patch0 -b .sav0 %patch0 -b .sav0
cp %{SOURCE1} pom.xml
%pom_remove_parent pom.xml
%build %build
#export JAVA_HOME=%{_jvmdir}/java-1.5.0 #export JAVA_HOME=%{_jvmdir}/java-1.5.0
# Use servletapi4 instead of servletapi5 in CLASSPATH # 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 install -p -m 644 bin/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# pom # pom
install -d -m 755 %{buildroot}%{_mavenpomdir} install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{SOURCE1} \ install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap -a velocity:velocity %add_maven_depmap -a velocity:velocity