Accepting request 694233 from home:juliogonzalezgil:branches:Java:packages

- Obsoletes, conflicts and provides must use only %%{version} as the 
  the release is managed automatically by OBS and not needed  (bsc#1132514)

OBS-URL: https://build.opensuse.org/request/show/694233
OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=41
This commit is contained in:
Fridrich Strba 2019-04-15 10:56:38 +00:00 committed by Git OBS Bridge
parent f85ad01f1d
commit b352bfd9e8
2 changed files with 132 additions and 126 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 12 13:16:12 UTC 2019 - Julio González Gil <jgonzalez@suse.com>
- Obsoletes, conflicts and provides must use only %%{version} as the
the release is managed automatically by OBS and not needed (bsc#1132514)
-------------------------------------------------------------------
Tue Mar 19 18:58:56 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -127,7 +127,7 @@ Requires: geronimo-annotation-1_0-api = %{version}
Requires: geronimo-commonj-1_1-apis = %{version}
Requires: geronimo-corba-1_0-apis = %{version}
Requires: geronimo-corba-2_3-apis = %{version}
#Requires: geronimo-corba-3_0-apis = %{version}-%{release}
#Requires: geronimo-corba-3_0-apis = %{version}
Requires: geronimo-ejb-2_1-api = %{version}
Requires: geronimo-ejb-3_0-api = %{version}
Requires: geronimo-el-1_0-api = %{version}
@ -159,8 +159,8 @@ Requires: geronimo-servlet-2_5-api = %{version}
Requires: geronimo-stax-1_0-api = %{version}
Requires: geronimo-ws-metadata-2_0-api = %{version}
Obsoletes: geronimo-javadoc
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
BuildArch: noarch
%description
@ -173,10 +173,10 @@ package are deprecated and will disapear in future releases.
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Provides: commonj_1_1_apis = %{version}-%{release}
Provides: commonj_1_1_apis = %{version}
Provides: commonj_apis = 1.1
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-commonj-1_1-apis
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -193,12 +193,12 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jaf = 1.0.2
# TODO: drop asap
Provides: activation_1_0_2_api = %{version}-%{release}
Provides: activation_1_0_2_api = %{version}
Provides: activation_api = 1.0.2
Provides: jaf_1_0_2_api = %{version}-%{release}
Provides: jaf_1_0_2_api = %{version}
Provides: jaf_api = 1.0.2
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jaf-1_0_2-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -215,12 +215,12 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jaf = 1.1
# TODO: drop asap
Provides: activation_1_1_api = %{version}-%{release}
Provides: activation_1_1_api = %{version}
Provides: activation_api = 1.1
Provides: jaf_1_1_api = %{version}-%{release}
Provides: jaf_1_1_api = %{version}
Provides: jaf_api = 1.1
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jaf-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -236,8 +236,8 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: annotation_1_0_api
Provides: annotation_api = 1.0
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-annotation-1_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -249,10 +249,10 @@ package are deprecated and will disapear in future releases.
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Provides: corba_1_0_apis = %{version}-%{release}
Provides: corba_1_0_apis = %{version}
Provides: corba_apis = 1.0
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-corba-1_0-apis
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -262,10 +262,10 @@ J2EE-Specifications: CORBA 1.0 Spec
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Provides: corba_2_3_apis = %{version}-%{release}
Provides: corba_2_3_apis = %{version}
Provides: corba_apis = 2.3
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-corba-2_3-apis
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -280,12 +280,12 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: ejb = 2.1
# TODO: drop asap
Provides: ejb_2_1_api = %{version}-%{release}
Provides: ejb_2_1_api = %{version}
Provides: ejb_api = 2.1
# drop the following asap
Obsoletes: ejb
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-ejb-2_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -302,11 +302,11 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: ejb = 3.0
# TODO: drop asap
Provides: ejb_3_0_api = %{version}-%{release}
Provides: ejb_3_0_api = %{version}
Provides: ejb_api = 3.0
Obsoletes: ejb
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-ejb-3_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -320,10 +320,10 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: el_1_0_api = %{version}-%{release}
Provides: el_1_0_api = %{version}
Provides: el_api = 1.0
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-el-1_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -337,10 +337,10 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: interceptor_3_0_api = %{version}-%{release}
Provides: interceptor_3_0_api = %{version}
Provides: interceptor_api = 3.0
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-interceptor-3_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -359,39 +359,39 @@ Requires(post): update-alternatives
#Provides: javamail = 1.3.1
#
Requires(preun): update-alternatives
Provides: commonj_1_1_apis = %{version}-%{release}
Provides: commonj_1_1_apis = %{version}
Provides: commonj_apis = 1.1
Provides: corba_2_3_apis = %{version}-%{release}
Provides: corba_2_3_apis = %{version}
Provides: corba_apis = 2.3
Provides: ejb_2_1_api = %{version}-%{release}
Provides: ejb_2_1_api = %{version}
Provides: ejb_api = 2.1
Provides: j2ee_connector_1_5_api = %{version}-%{release}
Provides: j2ee_connector_1_5_api = %{version}
Provides: j2ee_connector_api = 1.5
Provides: j2ee_deployment_1_1_api = %{version}-%{release}
Provides: j2ee_deployment_1_1_api = %{version}
Provides: j2ee_deployment_api = 1.1
Provides: j2ee_management_1_0_api = %{version}-%{release}
Provides: j2ee_management_1_0_api = %{version}
Provides: j2ee_management_api = 1.0
Provides: jacc_1_0_api = %{version}-%{release}
Provides: jacc_1_0_api = %{version}
Provides: jacc_api = 1.0
Provides: jaf_1_0_2_api = %{version}-%{release}
Provides: jaf_1_0_2_api = %{version}
Provides: jaf_api = 1.0.2
Provides: javamail_1_3_1_api = %{version}-%{release}
Provides: javamail_1_3_1_api = %{version}
Provides: javamail_api = 1.3.1
Provides: jaxr_1_0_api = %{version}-%{release}
Provides: jaxr_1_0_api = %{version}
Provides: jaxr_api = 1.0
Provides: jaxrpc_1_1_api = %{version}-%{release}
Provides: jaxrpc_1_1_api = %{version}
Provides: jaxrpc_api = 1.1
Provides: jms_1_1_api = %{version}-%{release}
Provides: jms_1_1_api = %{version}
Provides: jms_api = 1.1
Provides: jsp_2_0_api = %{version}-%{release}
Provides: jsp_2_0_api = %{version}
Provides: jsp_api = 2.0
Provides: jta_1_0_1B_api = %{version}-%{release}
Provides: jta_1_0_1B_api = %{version}
Provides: jta_api = 1.0.1B
Provides: qname_1_1_api = %{version}-%{release}
Provides: qname_1_1_api = %{version}
Provides: qname_api = 1.1
Provides: saaj_1_1_api = %{version}-%{release}
Provides: saaj_1_1_api = %{version}
Provides: saaj_api = 1.1
Provides: servlet_2_4_api = %{version}-%{release}
Provides: servlet_2_4_api = %{version}
Provides: servlet_api = 2.4
# XXX: (dwalluck): section added for backwards compatibility with Fedora 9
#
@ -413,11 +413,11 @@ Provides: jta = 1.0.1B
Provides: saaj = 1.1
Provides: servlet = 2.4
# added Epoch
Provides: geronimo-corba-2_3-apis = %{version}-%{release}
Provides: geronimo-corba-2_3-apis = %{version}
# added Epoch
Provides: geronimo-qname-1_1-api = %{version}-%{release}
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Provides: geronimo-qname-1_1-api = %{version}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-j2ee-1_4-apis
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -430,13 +430,13 @@ Requires: %{name}-pom = %{version}
Requires: jta_1_0_1B_api
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: j2ee_connector_1_5_api = %{version}-%{release}
Provides: j2ee_connector_1_5_api = %{version}
Provides: j2ee_connector_api = 1.5
# drop the following asap
Provides: j2ee-connector = 1.5
Obsoletes: j2ee-connector
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-j2ee-connector-1_5-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -448,13 +448,13 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: j2ee_deployment_1_1_api = %{version}-%{release}
Provides: j2ee_deployment_1_1_api = %{version}
Provides: j2ee_deployment_api = 1.1
# drop the following asap
Provides: j2ee-deployment = 1.1
Obsoletes: j2ee-deployment
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-j2ee-deployment-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -466,10 +466,10 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: javaee_deployment_1_1_api = %{version}-%{release}
Provides: javaee_deployment_1_1_api = %{version}
Provides: javaee_deployment_api = 1.1
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-javaee-deployment-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -486,10 +486,10 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jacc = 1.0
# TODO: drop asap
Provides: jacc_1_0_api = %{version}-%{release}
Provides: jacc_1_0_api = %{version}
Provides: jacc_api = 1.0
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jacc-1_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -503,10 +503,10 @@ Requires: %{name}-pom = %{version}
Requires: servlet_2_5_api
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jacc_1_1_api = %{version}-%{release}
Provides: jacc_1_1_api = %{version}
Provides: jacc_api = 1.1
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jacc-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -521,13 +521,13 @@ Requires: %{name}-pom = %{version}
Requires: ejb_2_1_api
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: j2ee_management_1_0_api = %{version}-%{release}
Provides: j2ee_management_1_0_api = %{version}
Provides: j2ee_management_api = 1.0
# drop the following asap
Provides: j2ee-management = 1.0
Obsoletes: j2ee-management
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-j2ee-management-1_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -540,13 +540,13 @@ Requires: %{name}-pom = %{version}
Requires: ejb_3_0_api
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: j2ee_management_1_1_api = %{version}-%{release}
Provides: j2ee_management_1_1_api = %{version}
Provides: j2ee_management_api = 1.1
# drop the following asap
Provides: j2ee-management = 1.1
Obsoletes: j2ee-management
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-j2ee-management-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -561,14 +561,14 @@ Requires: %{name}-pom = %{version}
Requires: jaf_1_0_2_api
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: javamail_1_3_1_api = %{version}-%{release}
Provides: javamail_1_3_1_api = %{version}
Provides: javamail_api = 1.3.1
# Do not provide javamail as this is just the API (is it?) and
# our 'javamail' alternative means the providers as well
# all in a single jar file called 'javamail.jar'
#Provides: javamail = 1.3.1
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-javamail-1_3_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -581,14 +581,14 @@ Requires: %{name}-pom = %{version}
Requires: jaf_1_1_api
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: javamail_1_4_api = %{version}-%{release}
Provides: javamail_1_4_api = %{version}
Provides: javamail_api = 1.4
# Do not provide javamail as this is just the API (is it?) and
# our 'javamail' alternative means the providers as well
# all in a single jar file called 'javamail.jar'
#Provides: javamail = 1.4
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-javamail-1_4-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -603,13 +603,13 @@ Requires: %{name}-pom = %{version}
Requires: jaf_1_0_2_api
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jaxr_1_0_api = %{version}-%{release}
Provides: jaxr_1_0_api = %{version}
Provides: jaxr_api = 1.0
# drop the following asap
Provides: jaxr = 1.0
Obsoletes: jaxr-api
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jaxr-1_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -626,10 +626,10 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jaxrpc = 1.1
# TODO: drop asap
Provides: jaxrpc_1_1_api = %{version}-%{release}
Provides: jaxrpc_1_1_api = %{version}
Provides: jaxrpc_api = 1.1
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jaxrpc-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -641,13 +641,13 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jms_1_1_api = %{version}-%{release}
Provides: jms_1_1_api = %{version}
Provides: jms_api = 1.1
# drop the following asap
Provides: jms = 1.1
Obsoletes: jms
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jms-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -659,10 +659,10 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jpa_3_0_api = %{version}-%{release}
Provides: jpa_3_0_api = %{version}
Provides: jpa_api = 3.0
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jpa-3_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -679,10 +679,10 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jsp = 2.0
# TODO: drop asap
Provides: jsp_2_0_api = %{version}-%{release}
Provides: jsp_2_0_api = %{version}
Provides: jsp_api = 2.0
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jsp-2_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -698,10 +698,10 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jsp = 2.1
# TODO: drop asap
Provides: jsp_2_1_api = %{version}-%{release}
Provides: jsp_2_1_api = %{version}
Provides: jsp_api = 2.1
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jsp-2_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -717,12 +717,12 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jta_1_0_1B_api = %{version}-%{release}
Provides: jta_1_0_1B_api = %{version}
Provides: jta_api = 1.0.1B
# drop the following asap
Provides: jta = 1.0.1B
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jta-1_0_1B-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -736,12 +736,12 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: jta_1_1_api = %{version}-%{release}
Provides: jta_1_1_api = %{version}
Provides: jta_api = 1.1
# drop the following asap
Provides: jta = 1.1
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-jta-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -755,10 +755,10 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: qname_1_1_api = %{version}-%{release}
Provides: qname_1_1_api = %{version}
Provides: qname_api = 1.1
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-qname-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -773,10 +773,10 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: saaj = 1.1
# TODO: drop asap
Provides: saaj_1_1_api = %{version}-%{release}
Provides: saaj_1_1_api = %{version}
Provides: saaj_api = 1.1
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-saaj-1_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -790,10 +790,10 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: servlet = 2.4
# TODO: drop asap
Provides: servlet_2_4_api = %{version}-%{release}
Provides: servlet_2_4_api = %{version}
Provides: servlet_api = 2.4
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-servlet-2_4-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -807,10 +807,10 @@ Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: servlet = 2.5
# TODO: drop asap
Provides: servlet_2_5_api = %{version}-%{release}
Provides: servlet_2_5_api = %{version}
Provides: servlet_api = 2.5
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-servlet-2_5-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -824,10 +824,10 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: stax_1_0_api = %{version}-%{release}
Provides: stax_1_0_api = %{version}
Provides: stax_api = 1.0
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-stax-1_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -841,10 +841,10 @@ Group: Development/Languages/Java
Requires: %{name}-pom = %{version}
Requires(post): update-alternatives
Requires(preun): update-alternatives
Provides: ws_metadata_2_0_api = %{version}-%{release}
Provides: ws_metadata_2_0_api = %{version}
Provides: ws_metadata_api = 2.0
Conflicts: %{name}-poms < %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Conflicts: %{name}-poms < %{version}
Obsoletes: %{name}-poms < %{version}
%description -n geronimo-ws-metadata-2_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
@ -855,8 +855,8 @@ package are deprecated and will disapear in future releases.
%package pom
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
Provides: %{name}-poms = %{version}-%{release}
Obsoletes: %{name}-poms < %{version}-%{release}
Provides: %{name}-poms = %{version}
Obsoletes: %{name}-poms < %{version}
%description pom
Geronimo is Apache's ASF-licenced J2EE server project. These are the