Browse code

apache-tomcat: offline build

Use precached tarball for extras:
base-for-apache-tomcat-%{version}.tar.xz

Change-Id: I6f5520eea3c95af97b24aca407683263816effdb
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3888
Reviewed-by: Sharath George
Tested-by: Sharath George

Alexey Makhalov authored on 2017/09/28 06:05:09
Showing 1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:	Apache Tomcat
2 2
 Name:		apache-tomcat
3 3
 Version:	8.5.20
4
-Release:	2%{?dist}
4
+Release:	3%{?dist}
5 5
 License:	Apache
6 6
 URL:		http://tomcat.apache.org
7 7
 Group:		Applications/System
... ...
@@ -10,6 +10,9 @@ Distribution: 	Photon
10 10
 BuildArch:      noarch
11 11
 Source0:    http://apache.mirrors.ionfish.org/tomcat/tomcat-8/v%{version}/src/%{name}-%{version}-src.tar.gz
12 12
 %define sha1 apache-tomcat=1d65afa114d0d2d01e70592710df513ebe5ae463
13
+# base-for-apache-tomcat is a cached -Dbase.path folder
14
+Source1:        base-for-%{name}-%{version}.tar.xz
15
+%define sha1    base=57dc7aafbe477d13c4d9b74f2eb694f56246f11c
13 16
 BuildRequires: openjre8
14 17
 BuildRequires: openjdk8
15 18
 BuildRequires: apache-ant
... ...
@@ -32,10 +35,11 @@ The Apache Tomcat package contains binaries for the Apache Tomcat servlet contai
32 32
 # remove pre-built binaries and windows files
33 33
 find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
34 34
    -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete
35
+%setup -D -b 1 -n %{name}-%{version}-src
35 36
 
36 37
 %build
37 38
 mkdir -p -m 700 %{_prefix}
38
-ant -Dbase.path="." deploy dist-prepare dist-source javadoc
39
+ant -Dbase.path="../base-for-%{name}-%{version}" deploy dist-prepare dist-source
39 40
 
40 41
 %install
41 42
 install -vdm 755 %{buildroot}%{_prefix}
... ...
@@ -87,6 +91,8 @@ rm -rf %{buildroot}/*
87 87
 %{_logsdir}/catalina.out
88 88
 
89 89
 %changelog
90
+*   Wed Sep 27 2017 Alexey Makhalov <amakhalov@vmware.com> 8.5.20-3
91
+-   Offline build, disable javadoc target
90 92
 *   Wed Sep 13 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 8.5.20-2
91 93
 -   Updated the permissions on directories packaged 
92 94
 *   Tue Aug 15 2017 Anish Swaminathan <anishs@vmware.com> 8.5.20-1