From efd813ecb5ab1236c78da40027a1f64a62e54182 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Mon, 6 Jun 2016 17:25:40 +0200
Subject: [PATCH] update to 1.2

---
 .gitignore   |  1 +
 cdi-api.spec | 54 ++++++++++++++++++++--------------------------------
 sources      |  2 +-
 3 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index df1d39f..ee87c40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /cdi-api-1.0.SP4.tar.xz
 /1.1.tar.gz
+/1.2.tar.gz
diff --git a/cdi-api.spec b/cdi-api.spec
index 926e033..1b56494 100644
--- a/cdi-api.spec
+++ b/cdi-api.spec
@@ -2,25 +2,22 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:             cdi-api
-Version:          1.1
-Release:          13%{?dist}
+Version:          1.2
+Release:          1%{?dist}
 Summary:          CDI API
 License:          ASL 2.0
 URL:              http://seamframework.org/Weld
 Source0:          https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz
 
 BuildArch:        noarch
+BuildRequires:    asciidoc
 BuildRequires:    maven-local
-# geronimo-annotation
-BuildRequires:    mvn(javax.annotation:jsr250-api)
 BuildRequires:    mvn(javax.el:javax.el-api)
 BuildRequires:    mvn(javax.inject:javax.inject)
-BuildRequires:    mvn(org.apache.geronimo.specs:specs:pom:)
 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.spec.javax.ejb:jboss-ejb-api_3.1_spec)
 BuildRequires:    mvn(org.jboss.weld:weld-parent:pom:)
 BuildRequires:    mvn(org.testng:testng::jdk15:)
 
@@ -38,53 +35,44 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n cdi-%{version}
 
-# Generate OSGI info
-%pom_xpath_set pom:project/pom:packaging bundle api
-%pom_xpath_inject "pom:project" "
-    <build>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <extensions>true</extensions>
-          <configuration>
-            <instructions>
-              <_nouses>true</_nouses>
-              <Export-Package>javax.decorator.*;javax.enterprise.context.*;javax.enterprise.event.*;javax.enterprise.inject.*;javax.enterprise.util.*</Export-Package>
-            </instructions>
-          </configuration>
-        </plugin>
-      </plugins>
-    </build>" api
-
-%pom_xpath_set "pom:dependency[pom:groupId = 'javax.el']/pom:artifactId" javax.el-api api
-
 cd api
 # J2EE API directory
 %mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1
 
 # Use newer version of interceptors API
-%pom_remove_dep "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec"
-%pom_add_dep "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec"
+%pom_change_dep "javax.interceptor:javax.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec"
 
 %build
-cd api
-%mvn_build -- -Denforcer.skip
+
+(
+ cd api
+ %mvn_build -- -Denforcer.skip
+)
+
+cd spec/src/main/doc
+asciidoc -n -b html5 -a toc2 -a toclevels=3 -a pygments -f html5.conf -o ../../../../cdi-spec.html cdi-spec.asciidoc
+asciidoc -n -b html5 -a toc2 -a toclevels=3 -a pygments -f html5.conf -o ../../../../license-asl2.html license-asl2.asciidoc
+asciidoc -n -b html5 -a toc2 -a toclevels=3 -a pygments -f html5.conf -o ../../../../license-jcp.html license-jcp.asciidoc
 
 %install
 cd api
 %mvn_install
 
 build-jar-repository %{buildroot}%{_javadir}/javax.enterprise.inject/ \
-                     jboss-interceptors-1.2-api geronimo-annotation javax.inject
+                     jboss-interceptors-1.2-api glassfish-el-api javax.inject
 
 %files -f api/.mfiles
-%dir %{_javadir}/%{name}
 %{_javadir}/javax.enterprise.inject/
+%doc cdi-spec.html
+%license license-asl2.html license-jcp.html
 
 %files javadoc -f api/.mfiles-javadoc
+%license license-asl2.html license-jcp.html
 
 %changelog
+* Mon Jun 06 2016 gil cattaneo <puntogil@libero.it> 1.2-1
+- Upstream release 1.2
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 9b9f97a..09783a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-392a5e82b2a8a4e2b913326fef91517a  1.1.tar.gz
+7472edb48b045bf3c2718b664fb75044  1.2.tar.gz