forked from pool/javahelp2
Fix build with jdk9
OBS-URL: https://build.opensuse.org/package/show/Java:packages/javahelp2?expand=0&rev=16
This commit is contained in:
@@ -31,6 +31,7 @@ Source2: %{name}-jhsearch.sh
|
||||
Source3: %{oname}-%{version}.pom
|
||||
Source4: https://javahelp.dev.java.net/license.txt
|
||||
BuildRequires: ant >= 1.6.5
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: geronimo-jsp-2_0-api
|
||||
BuildRequires: geronimo-servlet-2_4-api
|
||||
BuildRequires: java-devel >= 1.5.0
|
||||
@@ -38,7 +39,6 @@ BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-tools
|
||||
Requires: geronimo-jsp-2_0-api
|
||||
Requires: geronimo-servlet-2_4-api
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@@ -89,9 +89,9 @@ ln -s %{_javadir}/servlet.jar javahelp_nbproject/lib/servlet-api.jar
|
||||
cp %{SOURCE4} .
|
||||
|
||||
%build
|
||||
#export JAVA_HOME=%{_jvmdir}/java-1.5.0
|
||||
ant \
|
||||
-f javahelp_nbproject/build.xml \
|
||||
-Djavac.source=1.6 -Djavac.target=1.6 \
|
||||
-Djdic-jar-present=true \
|
||||
-Djdic-zip-present=true \
|
||||
-Dservlet-jar-present=true \
|
||||
@@ -108,6 +108,7 @@ install -m 755 %{SOURCE2} %{buildroot}%{_bindir}/jh2search
|
||||
install -m 644 javahelp_nbproject/dist/lib/jhall.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||
#cp -pr jhMaster/JavaHelp/doc/public-spec/dtd %{buildroot}%{_datadir}/%{name}
|
||||
cp -pr javahelp_nbproject/dist/lib/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
# pom
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
@@ -116,7 +117,6 @@ install -pm 644 %{SOURCE3} \
|
||||
%add_maven_depmap
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc license.txt
|
||||
%attr(0755,root,root) %{_bindir}/*
|
||||
%{_javadir}/%{name}.jar
|
||||
@@ -126,11 +126,9 @@ install -pm 644 %{SOURCE3} \
|
||||
%{_datadir}/maven-metadata/%{name}.xml
|
||||
|
||||
%files manual
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc jhMaster/JavaHelp/doc/public-spec/*
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user