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

OBS-URL: https://build.opensuse.org/request/show/493809
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=104

tomcat.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package tomcat
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -22,7 +22,7 @@
 %define elspec 3.0
 %define major_version 8
 %define minor_version 0
-%define micro_version 39
+%define micro_version 43
 %define packdname apache-tomcat-%{version}-src
 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
 %global basedir /srv/%{name}
@@ -76,7 +76,8 @@ Patch2:         tomcat-8.0.9-property-build.windows.patch
 # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373
 Patch3:         tomcat-8.0.33-JDTCompiler-java.patch
 # PATCH-FIX-SLE: Change security manager default policies bnc#891264
-Patch4:         tomcat-7.0-sle.catalina.policy.patch
+Patch4:         tomcat-8.0-sle.catalina.policy.patch
+
 BuildRequires:  ant >= 1.8.1
 BuildRequires:  ant-antlr
 BuildRequires:  apache-commons-collections
@@ -159,6 +160,7 @@ Provides:       %{name}-el-%{elspec}-api = %{version}-%{release}
 Provides:       el_3_0_api = %{version}-%{release}
 Provides:       el_api = %{elspec}
 Obsoletes:      el_api < %{elspec}
+Obsoletes:      tomcat-el-2_2-api
 
 %description el-3_0-api
 Expression Language API version 3.0.
@@ -180,6 +182,7 @@ Provides:       %{name}-jsp-%{jspspec}-api
 Provides:       jsp = %{jspspec}
 Provides:       jsp23
 Obsoletes:      jsp < %{jspspec}
+Obsoletes:      tomcat-jsp-2_2-api
 
 %description jsp-2_3-api
 Apache Tomcat JSP API implementation classes version 2.3
@@ -219,6 +222,7 @@ Provides:       servlet = %{servletspec}
 Provides:       servlet31
 Provides:       servlet7
 Obsoletes:      servlet < %{servletspec}
+Obsoletes:      tomcat-servlet-3_0-api
 
 %description servlet-3_1-api
 Apache Tomcat Servlet API implementation classes version 3.1
@@ -241,7 +245,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch1
 %patch2 -p1
 %patch3
-%patch4 -p1
+%patch4
 
 # remove date from docs
 sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl