pool/tomcat
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 548034 from home:mateialbu:branches:Java:packages

Browse Source 
update-alternatives fixes

OBS-URL: https://build.opensuse.org/request/show/548034
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=116
This commit is contained in:
Matei Albu
2017-12-04 10:14:09 +00:00
committed by Git OBS Bridge
parent 4851db8aac
commit 04c4ab4e9f
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tomcat.changes
View File

@@ -19,9 +19,12 @@ Fri Dec 1 21:46:18 UTC 2017 - malbu@suse.com
* Added: tomcat-9.0-sle.catalina.policy.patch
* Added: tomcat-9.0-tomcat-users-webapp.patch
- Renamed subpackage tomcat-3_1-api to tomcat-4_0-api
to reflect the new Servlet API version.
- Commented out JAVA_HOME in /etc/tomcat/tomcat.conf
- Marked /usr/share/java/*.jar symlinks to /etc/alternatives
as %ghost
- Renamed symlink /usr/share/java/servlet.jar to
/usr/share/java/tomcat-servlet.jar to avoid file conflict
with servletapi5
- Fixed wrong %ghost file paths for alternatives symlinks
-------------------------------------------------------------------
Thu Nov 23 13:50:29 UTC 2017 - rbrown@suse.com

26
tomcat.spec
View File

@@ -567,10 +567,10 @@ ln -sf %{_sbindir}/%{name} %{buildroot}/%{bindir}/catalina.sh
# Install update-alternatives content
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -s %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/el_api.jar
ln -s %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/el_1_0_api.jar
ln -s %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/jsp.jar
ln -s %{_sysconfdir}/alternatives/servlet %{buildroot}%{_javadir}/servlet.jar
ln -s -f %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/el_api.jar
ln -s -f %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/el_1_0_api.jar
ln -s -f %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/jsp.jar
ln -s -f %{_sysconfdir}/alternatives/servlet %{buildroot}%{_javadir}/%{name}-servlet.jar
mkdir -p %{buildroot}%{_tmpfilesdir}
cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
@@ -628,7 +628,7 @@ if [ $1 -eq 0 ] ; then
fi
%post servlet-4_0-api
update-alternatives --install %{_javadir}/servlet.jar servlet \
update-alternatives --install %{_javadir}/%{name}-servlet.jar servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
%postun servlet-4_0-api
@@ -714,10 +714,10 @@ rm -f \
%else
%{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
%endif
%ghost %{_javadir}/el_1_0_api.jar
%ghost %{_javadir}/el_api.jar
%ghost %{_sysconfdir}/alternatives/el_1_0_api.jar
%ghost %{_sysconfdir}/alternatives/el_api.jar
%{_javadir}/el_1_0_api.jar
%{_javadir}/el_api.jar
%ghost %{_sysconfdir}/alternatives/el_1_0_api
%ghost %{_sysconfdir}/alternatives/el_api
%files javadoc
%doc %{_javadocdir}/%{name}
@@ -725,8 +725,8 @@ rm -f \
%files jsp-2_3-api
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
%{_javadir}/%{name}-jsp-api.jar
%ghost %{_javadir}/jsp.jar
%ghost %{_sysconfdir}/alternatives/jsp.jar
%{_javadir}/jsp.jar
%ghost %{_sysconfdir}/alternatives/jsp
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
@@ -773,8 +773,8 @@ rm -f \
%doc LICENSE
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
%{_javadir}/%{name}-servlet-api.jar
%ghost %{_javadir}/servlet.jar
%ghost %{_sysconfdir}/alternatives/servlet.jar
%{_javadir}/%{name}-servlet.jar
%ghost %{_sysconfdir}/alternatives/servlet
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
%else