From e664e39c5c4a18ff70a76829b64784b2db1af7f0 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 18 Sep 2019 17:09:12 +0200
Subject: [PATCH] Update to upstream version 2.0.1

---
 .gitignore   |  1 +
 cdi-api.spec | 27 ++++++++++++++++++---------
 sources      |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee87c40..b133eaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /cdi-api-1.0.SP4.tar.xz
 /1.1.tar.gz
 /1.2.tar.gz
+/2.0.1.tar.gz
diff --git a/cdi-api.spec b/cdi-api.spec
index 7cd43fd..fd229a6 100644
--- a/cdi-api.spec
+++ b/cdi-api.spec
@@ -1,6 +1,6 @@
 Name:             cdi-api
-Version:          1.2
-Release:          9%{?dist}
+Version:          2.0.1
+Release:          1%{?dist}
 Summary:          CDI API
 License:          ASL 2.0
 URL:              http://seamframework.org/Weld
@@ -8,8 +8,9 @@ BuildArch:        noarch
 
 Source0:          https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz
 
+Patch1:           0001-Remove-dependency-on-glassfish-el.patch
+
 BuildRequires:    maven-local
-BuildRequires:    mvn(javax.el:javax.el-api)
 BuildRequires:    %{?module_prefix}mvn(javax.inject:javax.inject)
 BuildRequires:    mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:    mvn(org.apache.maven.plugins:maven-enforcer-plugin)
@@ -28,13 +29,18 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE
 %prep
 %setup -q -n cdi-%{version}/api
 
+%patch1 -p2
+
 # J2EE API directory
 %mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1
 
-# Change EL API scope to provided
-%pom_change_dep :javax.el-api :::provided
+%pom_remove_dep :jakarta.el-api
+
 # Use newer version of interceptors API
-%pom_change_dep :javax.interceptor-api org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec::provided
+%pom_change_dep :jakarta.interceptor-api org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec::provided
+
+# Fix failing tests
+%pom_xpath_remove 'pom:configuration/pom:argLine'
 
 %build
 %mvn_build -- -Denforcer.skip
@@ -43,11 +49,14 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE
 %mvn_install
 
 %files -n %{?module_prefix}%{name} -f .mfiles
-%doc ../spec/src/main/doc/cdi-spec.asciidoc
-%license ../spec/src/main/doc/license-asl2.asciidoc
-%license ../spec/src/main/doc/license-jcp.asciidoc
+%doc ../spec/src/main/asciidoc/cdi-spec.asciidoc
+%license ../spec/src/main/asciidoc/license-asl2.asciidoc
+%license ../spec/src/main/asciidoc/license-jcp-final.asciidoc
 
 %changelog
+* Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 2.0.1-1
+- Update to upstream version 2.0.1
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-9
 - Mass rebuild for javapackages-tools 201901
 
diff --git a/sources b/sources
index 4d46b4d..17dab93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (1.2.tar.gz) = 0da8ab15ff80f2df743db479d735c732648191c8f4897cabd5df1baa8d43a6b008b68e7a293494a67700b748df7d915c01684c87f0fafc390c2de6e20e15020d
+SHA512 (2.0.1.tar.gz) = fba21578e0652db01f88abd0c9f60cad7c02c3c32e8c9d4809856976e1c10d5bb401ed2fdb02078f0b059e4bb10facaec40986505a1d348b87a2de56e850fd7b