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

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

Browse Source 
- Build with JDK 8 to fix runtime errors when running with JDK 7 
  and 8
- Fix tomcat-digest classpath error (bsc#977410)
- Fix packaged /etc/alternatives symlinks for api libs that caused
  rpm -V to report link mismatch (bsc#1019016)

OBS-URL: https://build.opensuse.org/request/show/535989
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=113
This commit is contained in:
Matei Albu 2017-10-23 12:39:41 +00:00 committed by Git OBS Bridge
parent b3dd0c42dc
commit ee237b5c60
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tomcat-8.0-digest.script
View File

@ -34,7 +34,7 @@ export CLASSPATH
MAIN_CLASS="org.apache.catalina.startup.Tool"
BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
BASE_OPTIONS=""
BASE_JARS="commons-daemon tomcat/catalina servlet"
BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/api"
# Set parameters
set_classpath $BASE_JARS

9
tomcat.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Oct 23 09:42:48 UTC 2017 - malbu@suse.com
- Build with JDK 8 to fix runtime errors when running with JDK 7
and 8
- Fix tomcat-digest classpath error (bsc#977410)
- Fix packaged /etc/alternatives symlinks for api libs that caused
rpm -V to report link mismatch (bsc#1019016)
-------------------------------------------------------------------
Mon Oct 23 06:07:05 UTC 2017 - ecsos@opensuse.org

21
tomcat.spec
View File

@ -93,7 +93,7 @@ BuildRequires: geronimo-jaxrpc-1_1-api
BuildRequires: geronimo-qname-1_1-api
BuildRequires: geronimo-saaj-1_1-api
BuildRequires: jakarta-taglibs-standard >= 1.1
BuildRequires: java-devel >= 1.7.0
BuildRequires: java-devel = 1.8.0
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
@ -564,17 +564,6 @@ echo "%{name}/catalina-ant" > %{buildroot}/%{_sysconfdir}/ant.d/catalina-ant
#bnc#565901
ln -sf %{_sbindir}/%{name} %{buildroot}/%{bindir}/catalina.sh
# Install update-alternatives content
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/el_api.jar
ln -sf %{_sysconfdir}/alternatives/el_api.jar %{buildroot}%{_javadir}/el_api.jar
touch %{buildroot}%{_sysconfdir}/alternatives/el_1_0_api.jar
ln -sf %{_sysconfdir}/alternatives/el_1_0_api.jar %{buildroot}%{_javadir}/el_1_0_api.jar
touch %{buildroot}%{_sysconfdir}/alternatives/jsp.jar
ln -sf %{_sysconfdir}/alternatives/jsp.jar %{buildroot}%{_javadir}/jsp.jar
touch %{buildroot}%{_sysconfdir}/alternatives/servlet.jar
ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar
mkdir -p %{buildroot}%{_tmpfilesdir}
cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
f %{_localstatedir}/run/%{name}.pid 0644 tomcat tomcat -
@ -716,8 +705,8 @@ rm -f \
%else
%{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
%endif
%{_javadir}/el_1_0_api.jar
%{_javadir}/el_api.jar
%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
@ -727,7 +716,7 @@ rm -f \
%files jsp-2_3-api
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
%{_javadir}/%{name}-jsp-api.jar
%{_javadir}/jsp.jar
%ghost %{_javadir}/jsp.jar
%ghost %{_sysconfdir}/alternatives/jsp.jar
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
%if %{defined _maven_repository}
@ -776,7 +765,7 @@ rm -f \
%doc LICENSE
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
%{_javadir}/%{name}-servlet-api.jar
%{_javadir}/servlet.jar
%ghost %{_javadir}/servlet.jar
%ghost %{_sysconfdir}/alternatives/servlet.jar
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api