diff --git a/geronimo-specs.build.xml b/geronimo-specs.build.xml
index 8213f09..50a372c 100644
--- a/geronimo-specs.build.xml
+++ b/geronimo-specs.build.xml
@@ -238,8 +238,6 @@
-
-
diff --git a/geronimo-specs.changes b/geronimo-specs.changes
index 69929a8..81a18d3 100644
--- a/geronimo-specs.changes
+++ b/geronimo-specs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 19 14:33:51 UTC 2017 - tchvatal@suse.com
+
+- Remove javadoc to cut build time in half
+
-------------------------------------------------------------------
Fri May 19 13:22:01 UTC 2017 - tchvatal@suse.com
diff --git a/geronimo-specs.spec b/geronimo-specs.spec
index 174b03b..ed276ee 100644
--- a/geronimo-specs.spec
+++ b/geronimo-specs.spec
@@ -157,6 +157,7 @@ Requires: geronimo-servlet-2_4-api = %{version}
Requires: geronimo-servlet-2_5-api = %{version}
Requires: geronimo-stax-1_0-api = %{version}
Requires: geronimo-ws-metadata-2_0-api = %{version}
+Obsoletes: geronimo-javadoc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -166,16 +167,6 @@ J2EE-Specifications Note: You should use the subpackages for the
Specifications that you actually need. The ones installed by the main
package are deprecated and will disapear in future releases.
-%package javadoc
-Summary: Geronimo J2EE server J2EE specifications
-Group: Development/Languages/Java
-
-%description javadoc
-Geronimo is Apache's ASF-licenced J2EE server project. These are the
-J2EE-Specifications Note: You should use the subpackages for the
-Specifications that you actually need. The ones installed by the main
-package are deprecated and will disapear in future releases.
-
%package -n geronimo-commonj-1_1-apis
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
@@ -820,6 +811,7 @@ ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
-Didlj=%{java_home}/bin/idlj
%install
+set +x
# Directory for poms
install -d -m 0755 %{buildroot}/%{_mavenpomdir}
# subpackage jars
@@ -1216,6 +1208,7 @@ cp pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-specs.pom
%add_maven_depmap JPP-geronimo-specs.pom
+export NO_BRP_STALE_LINK_ERROR="yes"
# main package jars
install -d -m 0755 %{buildroot}%{_javadir}/geronimo
pushd %{buildroot}%{_javadir}/geronimo
@@ -1282,145 +1275,6 @@ popd
#pushd %{buildroot}%{_javadir}/geronimo
# ln -sf spec-j2ee-schema-1.0-M4.jar spec-j2ee-schema-1.0.jar
#popd
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jaf-1.0.2
- cp -pr geronimo-activation_1.0.2_spec-1.2/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jaf-1.0.2
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jaf-1.1
- cp -pr geronimo-activation_1.1_spec-1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jaf-1.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/annotation-1.0
- cp -pr geronimo-annotation_1.0_spec-1.1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/annotation-1.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/commonj-1.1
- cp -pr geronimo-spec-commonj/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/commonj-1.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/corba-1.0
- cp -pr geronimo-spec-corba/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/corba-1.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/corba-2.3
- cp -pr geronimo-spec-corba-2.3/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/corba-2.3
-#install -d -m 755 \
-# %{buildroot}%{_javadocdir}/%{name}-%{version}/corba-3.0
-# cp -pr geronimo-spec-corba-3.0/target/site/apidocs/* \
-# %{buildroot}%{_javadocdir}/%{name}-%{version}/corba-3.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/ejb-2.1
- cp -pr geronimo-ejb_2.1_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/ejb-2.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/ejb-3.0
- cp -pr geronimo-ejb_3.0_spec-1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/ejb-3.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/el-1.0
- cp -pr geronimo-el_1.0_spec-1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/el-1.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/interceptor-3.0
- cp -pr geronimo-interceptor_3.0_spec-1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/interceptor-3.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/j2ee-connector-1.5
- cp -pr geronimo-j2ee-connector_1.5_spec-1.1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/j2ee-connector-1.5
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/j2ee-deployment-1.1
- cp -pr geronimo-j2ee-deployment_1.1_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/j2ee-deployment-1.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/javaee-deployment-1.1
- cp -pr geronimo-javaee-deployment_1.1MR3_spec-1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/javaee-deployment-1.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/j2ee-management-1.0
- cp -pr geronimo-j2ee-management_1.0_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/j2ee-management-1.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/j2ee-management-1.1
- cp -pr geronimo-j2ee-management_1.1_spec-1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/j2ee-management-1.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/javamail-1.3.1
- cp -pr geronimo-javamail_1.3.1_spec-1.3/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/javamail-1.3.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/javamail-1.4
- cp -pr geronimo-javamail_1.4_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/javamail-1.4
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jaxrpc-1.1
- cp -pr geronimo-jaxrpc_1.1_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jaxrpc-1.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jaxr-1.0
- cp -pr geronimo-jaxr_1.0_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jaxr-1.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jms-1.1
- cp -pr geronimo-jms_1.1_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jms-1.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jpa-3.0
- cp -pr geronimo-jpa_3.0_spec-1.1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jpa-3.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jsp-2.0
- cp -pr geronimo-jsp_2.0_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jsp-2.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jsp-2.1
- cp -pr geronimo-jsp_2.1_spec-1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jsp-2.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jta-1.0.1B
- cp -pr geronimo-jta_1.0.1B_spec-1.1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jta-1.0.1B
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jta-1.1
- cp -pr geronimo-jta_1.1_spec-1.1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jta-1.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/qname-1.1
- cp -pr geronimo-qname_1.1_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/qname-1.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/saaj-1.1
- cp -pr geronimo-saaj_1.1_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/saaj-1.1
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/servlet-2.4
- cp -pr geronimo-servlet_2.4_spec-1.1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/servlet-2.4
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/servlet-2.5
- cp -pr geronimo-servlet_2.5_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/servlet-2.5
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/stax-1.0
- cp -pr geronimo-stax-api_1.0_spec-1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/stax-1.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/ws-metadata-2.0
- cp -pr geronimo-ws-metadata_2.0_spec-1.1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/ws-metadata-2.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jacc-1.0
- cp -pr geronimo-j2ee-jacc_1.0_spec-1.1/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jacc-1.0
-install -d -m 755 \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jacc-1.1
- cp -pr geronimo-jacc_1.1_spec-1.0/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/jacc-1.1
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
# documents
install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}
install -d -m 755 \
@@ -1565,8 +1419,6 @@ install -d -m 755 \
%{buildroot}%{_docdir}/%{name}-%{version}/j2ee-1.4
cp -pr etc/LICENSE.txt \
%{buildroot}%{_docdir}/%{name}-%{version}
-export NO_BRP_STALE_LINK_ERROR="yes"
-%fdupes -s %{buildroot}/%{_javadocdir}/%{name}-%{version}
# update-alternatives symlinks
mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
@@ -2137,10 +1989,6 @@ fi
%dir %{_javadir}/geronimo
%{_javadir}/geronimo/*
-%files javadoc
-%defattr(-,root,root)
-%doc %{_javadocdir}/*
-
%files poms
%defattr(-,root,root)
%{_datadir}/maven-metadata/%{name}.xml*