From d9d518a0bc6cf28b2553fd24c9d2c6dc59b5ce0d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 16 May 2020 15:45:20 +0200
Subject: [PATCH] Update to upstream version 2.0.2

---
 .gitignore   |  1 +
 cdi-api.spec | 62 +++++++++++++++++++++++-----------------------------
 sources      |  2 +-
 3 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index b133eaf..2dca9aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /1.1.tar.gz
 /1.2.tar.gz
 /2.0.1.tar.gz
+/2.0.2.tar.gz
diff --git a/cdi-api.spec b/cdi-api.spec
index d910841..b4713c7 100644
--- a/cdi-api.spec
+++ b/cdi-api.spec
@@ -1,24 +1,18 @@
-Name:             cdi-api
-Version:          2.0.1
-Release:          3%{?dist}
-Summary:          CDI API
-License:          ASL 2.0
-URL:              http://seamframework.org/Weld
-BuildArch:        noarch
+Name:           cdi-api
+Version:        2.0.2
+Release:        1%{?dist}
+Summary:        CDI API
+License:        ASL 2.0
+URL:            https://github.com/eclipse-ee4j/cdi
+BuildArch:      noarch
 
-Source0:          https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz
+Source0:        https://github.com/eclipse-ee4j/cdi/archive/%{version}.tar.gz
 
-Patch1:           0001-Remove-dependency-on-glassfish-el.patch
+Patch1:         0001-Remove-dependency-on-glassfish-el.patch
 
-BuildRequires:    maven-local-openjdk8
-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)
-BuildRequires:    mvn(org.apache.maven.surefire:surefire-testng)
-BuildRequires:    mvn(org.codehaus.mojo:build-helper-maven-plugin)
-BuildRequires:    mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec)
-BuildRequires:    mvn(org.jboss.weld:weld-parent:pom:)
-BuildRequires:    mvn(org.testng:testng::jdk15:)
+BuildRequires:  maven-local
+BuildRequires:  %{?module_prefix}mvn(jakarta.inject:jakarta.inject-api)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 
 %description
 APIs for JSR-299: Contexts and Dependency Injection for Java EE
@@ -27,35 +21,33 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE
 %{?javadoc_package}
 
 %prep
-%setup -q -n cdi-%{version}/api
+%setup -q -n cdi-%{version}
 
-%patch1 -p2
+%pom_remove_parent
+%pom_remove_parent api
+%pom_disable_module spec
+%pom_remove_plugin -r :maven-javadoc-plugin
 
-# J2EE API directory
-%mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1
+%pom_remove_dep :jakarta.el-api api
+%pom_remove_dep :jakarta.interceptor-api api
+rm -rf api/src/main/java/javax/enterprise/{context/,inject/spi/,inject/se/,inject/Model.java,inject/New.java}
 
-%pom_remove_dep :jakarta.el-api
-
-# Use newer version of interceptors API
-%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'
-
-%mvn_alias jakarta.enterprise:jakarta.enterprise.cdi-api javax.enterprise:cdi-api
+%mvn_alias :jakarta.enterprise.cdi-api javax.enterprise:cdi-api
 
 %build
-%mvn_build -- -Denforcer.skip
+%mvn_build -f
 
 %install
 %mvn_install
 
 %files -n %{?module_prefix}%{name} -f .mfiles
-%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
+%doc README.md
+%license LICENSE.txt
 
 %changelog
+* Sat May 16 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.2-1
+- Update to upstream version 2.0.2
+
 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.1-3
 - Build with OpenJDK 8
 
diff --git a/sources b/sources
index 17dab93..364ab61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (2.0.1.tar.gz) = fba21578e0652db01f88abd0c9f60cad7c02c3c32e8c9d4809856976e1c10d5bb401ed2fdb02078f0b059e4bb10facaec40986505a1d348b87a2de56e850fd7b
+SHA512 (2.0.2.tar.gz) = 90c942115a6835ce0f8b69aa9722198d6615d7b5b09fbd4260b2f89196895d674d7acd22c15499e7d17e7345d8ed78ce0e40c99a9a04915245641ca47c23b6c2