This commit is contained in:
parent
ba13c8e0ec
commit
3686d1936c
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 8 11:32:53 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Do not depend on the parent pom since we are not building using
|
||||||
|
Maven.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 1 16:33:40 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Fri Feb 1 16:33:40 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -33,12 +33,10 @@ Source10: %{name}-CatalogManager.properties
|
|||||||
Patch0: %{name}-1.2-crosslink.patch
|
Patch0: %{name}-1.2-crosslink.patch
|
||||||
Patch1: %{name}-1.2-osgi.patch
|
Patch1: %{name}-1.2-osgi.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: apache-parent
|
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
#!BuildIgnore: xerces-j2 xml-apis xml-resolver
|
#!BuildIgnore: xerces-j2 xml-apis xml-resolver
|
||||||
Requires: apache-parent
|
|
||||||
# Explicit javapackages-tools requires since scripts use
|
# Explicit javapackages-tools requires since scripts use
|
||||||
# /usr/share/java-utils/java-functions
|
# /usr/share/java-utils/java-functions
|
||||||
Requires: javapackages-tools
|
Requires: javapackages-tools
|
||||||
@ -71,11 +69,15 @@ Javadoc for %{name}.
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
|
||||||
|
cp %{SOURCE5} pom.xml
|
||||||
|
|
||||||
# remove all binary libs and prebuilt javadocs
|
# remove all binary libs and prebuilt javadocs
|
||||||
find . -name "*.jar" -delete
|
find . -name "*.jar" -delete
|
||||||
rm -rf docs
|
rm -rf docs
|
||||||
sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt
|
sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt
|
||||||
|
|
||||||
|
%pom_remove_parent .
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{ant} -f resolver.xml -Dant.build.javac.source=6 -Dant.build.javac.target=6 jar javadocs
|
%{ant} -f resolver.xml -Dant.build.javac.source=6 -Dant.build.javac.target=6 jar javadocs
|
||||||
|
|
||||||
@ -91,7 +93,7 @@ popd
|
|||||||
|
|
||||||
# pom
|
# pom
|
||||||
install -d -m 0755 %{buildroot}%{_mavenpomdir}
|
install -d -m 0755 %{buildroot}%{_mavenpomdir}
|
||||||
install -pm 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/%{name}.pom
|
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
|
||||||
%add_maven_depmap %{name}.pom %{name}.jar
|
%add_maven_depmap %{name}.pom %{name}.jar
|
||||||
|
|
||||||
# javadoc
|
# javadoc
|
||||||
|
Loading…
x
Reference in New Issue
Block a user