rpm/tomcat
SHA256
1
0
Fork 0
forked from pool/tomcat
Code Pull Requests Activity

Accepting request 234205 from home:deadpoint:branches:Java:packages

Browse Source 
Update to 7.0.53 and various SLE_11 fixes

OBS-URL: https://build.opensuse.org/request/show/234205
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=43
This commit is contained in:
Tomáš Chvátal
2014-05-20 11:53:20 +00:00
committed by Git OBS Bridge
parent 458c8940cf
commit 59782c48d1
7 changed files with 89 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tomcat.spec
View File

@@ -26,7 +26,7 @@
%define major_version 7
%define minor_version 0
%define micro_version 52
%define micro_version 53
%define packdname apache-tomcat-%{version}-src
%define tcuid 91
@@ -81,11 +81,19 @@ Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
#PATCH-FIX-OPENSUSE: skip few windows specific parts of build
Patch2: tomcat-7.0.52-property-build.windows.patch
# PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373
Patch3: tomcat-7.0.53-JDTCompiler-java.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: ant
BuildRequires: ant >= 1.8.1
%if 0%{?suse_version} == 1110
BuildRequires: ant-antlr
BuildRequires: ant-nodeps
BuildRequires: ant-trax
#BuildRequires: saxon
%endif
BuildRequires: ecj >= 4.2.1
BuildRequires: fdupes
BuildRequires: findutils
@@ -268,6 +276,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3
%build
#bnc847505: build all commons-dbcp-tomcat jars before tomcat
@@ -358,6 +367,10 @@ touch META-INF/MANIFEST.MF
zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF
%install
%if 0%{?suse_version} == 1110
export NO_BRP_CHECK_BYTECODE_VERSION=true
%endif
# build initial path structure
%{__install} -d -m 0755 %{buildroot}%{_bindir}
%{__install} -d -m 0755 %{buildroot}%{_sbindir}
@@ -581,7 +594,7 @@ ln -sf %{_sbindir}/d%{name} %{buildroot}/%{bindir}/catalina.sh
%if %{with_systemd}
%service_add_post %{name}.service
%else
%{fillup_only -f %{name}}
%{fillup_only %{name}}
%endif
%preun
@@ -602,6 +615,8 @@ fi
%restart_on_update %{name}
%endif
# start - systemd services
%if %{with_systemd}
%pre jsvc
%service_add_pre %{name}-jsvc.service
@@ -614,6 +629,9 @@ fi
%postun jsvc
%service_del_postun %{name}-jsvc.service
%endif
# end - systemd services
%post el-2_2-api
%{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
%{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300