- Remove pointless conflicts on provide/obsolete symbols

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=72
This commit is contained in:
Tomáš Chvátal 2015-06-01 09:08:04 +00:00 committed by Git OBS Bridge
parent df8ed8cbe0
commit 270bc07d4d
2 changed files with 5 additions and 3 deletions

View File

@ -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 Mon Jun 1 08:54:33 UTC 2015 - tchvatal@suse.com

View File

@ -161,7 +161,6 @@ Provides: %{name}-el-%{elspec}-api = %{version}-%{release}
Provides: el_3_0_api = %{version}-%{release} Provides: el_3_0_api = %{version}-%{release}
Provides: el_api = %{elspec} Provides: el_api = %{elspec}
Obsoletes: el_api < %{elspec} Obsoletes: el_api < %{elspec}
Conflicts: el_api < %{elspec}
%description el-3_0-api %description el-3_0-api
Expression Language API version 3.0. Expression Language API version 3.0.
@ -183,7 +182,6 @@ Provides: %{name}-jsp-%{jspspec}-api
Provides: jsp = %{jspspec} Provides: jsp = %{jspspec}
Provides: jsp23 Provides: jsp23
Obsoletes: jsp < %{jspspec} Obsoletes: jsp < %{jspspec}
Conflicts: jsp < %{jspspec}
%description jsp-2_3-api %description jsp-2_3-api
Apache Tomcat JSP API implementation classes version 2.3 Apache Tomcat JSP API implementation classes version 2.3
@ -227,7 +225,6 @@ Provides: servlet = %{servletspec}
Provides: servlet31 Provides: servlet31
Provides: servlet7 Provides: servlet7
Obsoletes: servlet < %{servletspec} Obsoletes: servlet < %{servletspec}
Conflicts: servlet < %{servletspec}
%description servlet-3_1-api %description servlet-3_1-api
Apache Tomcat Servlet API implementation classes version 3.1 Apache Tomcat Servlet API implementation classes version 3.1