Browse code
Updated apache-tomcat package to version 8.5.13 and added logic to build apache tomcat binaries from source
Change-Id: Ibe64a300c68e97c9e1d38dcbf376c0325ccf37cf
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2345
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Priyesh Padmavilasom <ppadmavilasom@vmware.com>
dthaluru authored on 2017/04/11 03:23:54Showing 1 changed files
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
Summary: Apache Tomcat |
| 2 | 2 |
Name: apache-tomcat |
| 3 |
-Version: 8.5.8 |
|
| 3 |
+Version: 8.5.13 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: Apache |
| 6 | 6 |
URL: http://tomcat.apache.org |
| ... | ... |
@@ -8,9 +8,14 @@ Group: Applications/System |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
BuildArch: noarch |
| 11 |
-Source0: http://mirror.cogentco.com/pub/apache/tomcat/tomcat-8/v%{version}/bin/%{name}-%{version}.tar.gz
|
|
| 12 |
-%define sha1 apache-tomcat=25fc3b108a81c421fb5cd2632a56cdde9fcc03bc |
|
| 13 |
-Requires: openjre >= 1.8.0.102 |
|
| 11 |
+Source0: http://apache.mirrors.ionfish.org/tomcat/tomcat-8/v%{version}/src/%{name}-%{version}-src.tar.gz
|
|
| 12 |
+%define sha1 apache-tomcat=a2097a08b023c363098917078d9a23bd7a3b6032 |
|
| 13 |
+%define java_macros_version 1.8.0.112-2%{?dist}
|
|
| 14 |
+BuildRequires: openjre >= %{java_macros_version}
|
|
| 15 |
+BuildRequires: openjdk >= %{java_macros_version}
|
|
| 16 |
+BuildRequires: apache-ant >= 1.9.6 |
|
| 17 |
+Requires: openjre >= %{java_macros_version}
|
|
| 18 |
+Requires: apache-ant >= 1.9.6 |
|
| 14 | 19 |
|
| 15 | 20 |
%define _prefix /var/opt/%{name}-%{version}
|
| 16 | 21 |
%define _bindir %{_prefix}/bin
|
| ... | ... |
@@ -22,21 +27,33 @@ Requires: openjre >= 1.8.0.102 |
| 22 | 22 |
The Apache Tomcat package contains binaries for the Apache Tomcat servlet container. |
| 23 | 23 |
|
| 24 | 24 |
%prep |
| 25 |
-%setup -qn %{name}-%{version}
|
|
| 25 |
+%setup -qn %{name}-%{version}-src
|
|
| 26 |
+# remove pre-built binaries and windows files |
|
| 27 |
+find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ |
|
| 28 |
+ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -delete |
|
| 26 | 29 |
|
| 27 | 30 |
%build |
| 31 |
+export ANT_HOME=%{_ant_home}
|
|
| 32 |
+export JAVA_HOME=%{_java_home}
|
|
| 33 |
+mkdir -p -m 700 %{_prefix}
|
|
| 34 |
+$ANT_HOME/bin/ant -Dbase.path="." deploy dist-prepare dist-source javadoc |
|
| 28 | 35 |
|
| 29 | 36 |
%install |
| 37 |
+mkdir -p -m 700 %{buildroot}%{_prefix}
|
|
| 38 |
+mkdir -p -m 700 %{buildroot}%{_bindir}
|
|
| 39 |
+mkdir -p -m 700 %{buildroot}%{_libdir}
|
|
| 40 |
+mkdir -p -m 700 %{buildroot}%{_confdir}
|
|
| 41 |
+mkdir -p -m 700 %{buildroot}%{_webappsdir}
|
|
| 42 |
+cp -r %{_builddir}/%{name}-%{version}-src/output/build/bin/* %{buildroot}%{_bindir}
|
|
| 43 |
+cp -r %{_builddir}/%{name}-%{version}-src/output/build/lib/* %{buildroot}%{_libdir}
|
|
| 44 |
+cp -r %{_builddir}/%{name}-%{version}-src/output/build/conf/* %{buildroot}%{_confdir}
|
|
| 45 |
+cp -r %{_builddir}/%{name}-%{version}-src/output/build/webapps/* %{buildroot}%{_webappsdir}
|
|
| 46 |
+ |
|
| 47 |
+cp %{_builddir}/%{name}-%{version}-src/LICENSE %{buildroot}%{_prefix}
|
|
| 48 |
+cp %{_builddir}/%{name}-%{version}-src/NOTICE %{buildroot}%{_prefix}
|
|
| 30 | 49 |
|
| 31 |
-install -vdm755 %{buildroot}/var/opt/%{name}-%{version}
|
|
| 32 |
-mv -v %{_builddir}/%{name}-%{version}/* %{buildroot}/var/opt/%{name}-%{version}/
|
|
| 33 | 50 |
rm -rf %{buildroot}/var/opt/%{name}-%{version}/webapps/examples
|
| 34 |
-rm -rf %{buildroot}/var/opt/%{name}-%{version}/webapps/work
|
|
| 35 |
-rm -rf %{buildroot}/var/opt/%{name}-%{version}/webapps/temp
|
|
| 36 | 51 |
rm -rf %{buildroot}/var/opt/%{name}-%{version}/webapps/docs
|
| 37 |
-rm -rf %{buildroot}/var/opt/%{name}-%{version}/temp
|
|
| 38 |
-rm -f %{buildroot}/var/opt/%{name}-%{version}/RUNNING.txt
|
|
| 39 |
-rm -f %{buildroot}/var/opt/%{name}-%{version}/RELEASE-NOTES
|
|
| 40 | 52 |
|
| 41 | 53 |
%clean |
| 42 | 54 |
rm -rf %{buildroot}/*
|
| ... | ... |
@@ -51,21 +68,23 @@ rm -rf %{buildroot}/*
|
| 51 | 51 |
%{_webappsdir}/*
|
| 52 | 52 |
|
| 53 | 53 |
%changelog |
| 54 |
-* Tue Nov 22 2016 Anish Swaminathan <anishs@vmware.com> 8.5.8-1 |
|
| 55 |
-- Upgraded to version 8.5.8 |
|
| 56 |
-* Wed Oct 05 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.0.37-1 |
|
| 57 |
-- Update to version 8.0.37. Change openjre requires to latest |
|
| 58 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.0.35-2 |
|
| 59 |
-- GA - Bump release of all rpms |
|
| 60 |
-* Fri May 20 2016 Divya Thaluru <dthaluru@vmware.com> 8.0.35-1 |
|
| 61 |
-- Upgraded to version 8.0.35 |
|
| 62 |
-* Tue May 03 2016 Anish Swaminathan <anishs@vmware.com> 8.0.33-1 |
|
| 63 |
-- Upgraded to version 8.0.33 |
|
| 64 |
-* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 7.0.68-1 |
|
| 65 |
-- Upgraded to version 7.0.68 |
|
| 66 |
-* Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 7.0.63-3 |
|
| 67 |
-- Change path to /var/opt. |
|
| 68 |
-* Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 7.0.63-2 |
|
| 69 |
-- Updated dependency after repackaging openjdk. |
|
| 70 |
-* Wed Jul 8 2015 Sriram Nambakam <snambakam@vmware.com> 7.0.63 |
|
| 71 |
-- Initial build. First version |
|
| 54 |
+* Mon Apr 10 2017 Divya Thaluru <dthaluru@vmware.com> 8.5.13-1 |
|
| 55 |
+- Upgraded to version 8.5.13 and also added logic to build binaries from source |
|
| 56 |
+* Tue Nov 22 2016 Anish Swaminathan <anishs@vmware.com> 8.5.8-1 |
|
| 57 |
+- Upgraded to version 8.5.8 |
|
| 58 |
+* Wed Oct 05 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.0.37-1 |
|
| 59 |
+- Update to version 8.0.37. Change openjre requires to latest |
|
| 60 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.0.35-2 |
|
| 61 |
+- GA - Bump release of all rpms |
|
| 62 |
+* Fri May 20 2016 Divya Thaluru <dthaluru@vmware.com> 8.0.35-1 |
|
| 63 |
+- Upgraded to version 8.0.35 |
|
| 64 |
+* Tue May 03 2016 Anish Swaminathan <anishs@vmware.com> 8.0.33-1 |
|
| 65 |
+- Upgraded to version 8.0.33 |
|
| 66 |
+* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 7.0.68-1 |
|
| 67 |
+- Upgraded to version 7.0.68 |
|
| 68 |
+* Mon Nov 16 2015 Sharath George <sharathg@vmware.com> 7.0.63-3 |
|
| 69 |
+- Change path to /var/opt. |
|
| 70 |
+* Wed Sep 16 2015 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 7.0.63-2 |
|
| 71 |
+- Updated dependency after repackaging openjdk. |
|
| 72 |
+* Wed Jul 8 2015 Sriram Nambakam <snambakam@vmware.com> 7.0.63 |
|
| 73 |
+- Initial build. First version |