From 270bc07d4d92c4658e618454ff6ba5692e811af48a7b4c35cb9efb6343f02d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 1 Jun 2015 09:08:04 +0000 Subject: [PATCH] - Remove pointless conflicts on provide/obsolete symbols OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=72 --- tomcat.changes | 5 +++++ tomcat.spec | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index 448ebae..c716ba2 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 1 09:07:45 UTC 2015 - tchvatal@suse.com + +- Remove pointless conflicts on provide/obsolete symbols + ------------------------------------------------------------------- Mon Jun 1 08:54:33 UTC 2015 - tchvatal@suse.com diff --git a/tomcat.spec b/tomcat.spec index 7461231..a3cf427 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -161,7 +161,6 @@ Provides: %{name}-el-%{elspec}-api = %{version}-%{release} Provides: el_3_0_api = %{version}-%{release} Provides: el_api = %{elspec} Obsoletes: el_api < %{elspec} -Conflicts: el_api < %{elspec} %description el-3_0-api Expression Language API version 3.0. @@ -183,7 +182,6 @@ Provides: %{name}-jsp-%{jspspec}-api Provides: jsp = %{jspspec} Provides: jsp23 Obsoletes: jsp < %{jspspec} -Conflicts: jsp < %{jspspec} %description jsp-2_3-api Apache Tomcat JSP API implementation classes version 2.3 @@ -227,7 +225,6 @@ Provides: servlet = %{servletspec} Provides: servlet31 Provides: servlet7 Obsoletes: servlet < %{servletspec} -Conflicts: servlet < %{servletspec} %description servlet-3_1-api Apache Tomcat Servlet API implementation classes version 3.1