SHA256
1
0
forked from pool/tomcat

- Remove few deps not really needed for sle11.

- Drop unused files obs.bl and local.lb
- Drop unused collections-tomcat-build.xml

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=47
This commit is contained in:
Tomáš Chvátal
2014-07-10 14:47:50 +00:00
committed by Git OBS Bridge
parent c03a07e884
commit d82dd1d1df
5 changed files with 12 additions and 4427 deletions

View File

@@ -88,12 +88,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
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
@@ -305,7 +300,7 @@ touch HACK
%{__mkdir_p} HACKDIR
touch HACKDIR/build.xml
%{ant} -Dbase.path="." \
ant -Dbase.path="." \
-Djava.7.home="%{java_home}" \
-Dbuild.compiler="modern" \
-Dcommons-collections.jar="$(build-classpath commons-collections)" \
@@ -370,7 +365,6 @@ zip -u output/build/bin/tomcat-juli.jar META-INF/MANIFEST.MF
%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}
@@ -578,9 +572,6 @@ echo "%{name}/catalina-ant" > %{buildroot}/%{_sysconfdir}/ant.d/catalina-ant
ln -sf %{_sbindir}/d%{name} %{buildroot}/%{bindir}/catalina.sh
%endif
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%pre
# add the tomcat user and group
%{_sbindir}/groupadd -r tomcat 2>/dev/null || :
@@ -615,7 +606,6 @@ fi
%restart_on_update %{name}
%endif
# start - systemd services
%if %{with_systemd}
%pre jsvc
%service_add_pre %{name}-jsvc.service
@@ -628,9 +618,7 @@ 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