[weld-core] Upstream release 2.0.2.Final

[Marek Goldmann]

commit d7521df2cb7e19837cdf7917c4921fda10e9dfd4
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Fri Jul 26 13:07:31 2013 +0200

    Upstream release 2.0.2.Final

 .gitignore     |    1 +
 sources        |    2 +-
 weld-core.spec |   82 ++++++++++++++++---------------------------------------
 3 files changed, 26 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 731d072..82b71d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /weld-core-1.1.5.AS71.Final-CLEAN.tar.xz
 /1.1.13.Final.tar.gz
+/2.0.2.Final.tar.gz
diff --git a/sources b/sources
index b474645..b7b6675 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a0cdaeeba9fd237ecf03ac6339bca1ff  1.1.13.Final.tar.gz
+79e2c87d206dafc8df5ae8764cebf738  2.0.2.Final.tar.gz
diff --git a/weld-core.spec b/weld-core.spec
index f34fe97..18aa1ae 100644
--- a/weld-core.spec
+++ b/weld-core.spec
@@ -2,10 +2,9 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name: weld-core
-Version: 1.1.13
-Release: 2%{namedreltag}%{?dist}
+Version: 2.0.2
+Release: 1%{?dist}
 Summary: Reference Implementation for JSR-299: Contexts and Dependency Injection (CDI)
-Group: Development/Libraries
 License: ASL 2.0 and LGPLv2+ and (CDDL or GPLv2 with exceptions)
 URL: http://seamframework.org/Weld
 
@@ -18,7 +17,6 @@ BuildRequires: findbugs
 BuildRequires: jpackage-utils
 BuildRequires: java-devel
 BuildRequires: jboss-interceptor
-BuildRequires: jboss-servlet-3.0-api
 BuildRequires: maven-local
 BuildRequires: maven-clean-plugin
 BuildRequires: maven-compiler-plugin
@@ -34,21 +32,17 @@ BuildRequires: maven-surefire-report-plugin
 BuildRequires: maven-plugin-build-helper
 BuildRequires: weld-api
 BuildRequires: weld-parent
-BuildRequires: cdi-api1
+BuildRequires: cdi-api
+BuildRequires: jboss-jsf-2.1-api
 BuildRequires: mvn(javax.faces:jsf-api)
 BuildRequires: mvn(javax.persistence:persistence-api)
 BuildRequires: mvn(javax.servlet.jsp:jsp-api)
-
-Requires: java
-Requires: jpackage-utils
-Requires: jboss-interceptor
-Requires: jboss-servlet-3.0-api
-Requires: weld-api
-Requires: cdi-api1
-Requires: mvn(javax.faces:jsf-api)
-Requires: mvn(javax.persistence:persistence-api)
-Requires: mvn(javax.servlet.jsp:jsp-api)
-
+BuildRequires: mvn(ch.qos.cal10n.plugins:maven-cal10n-plugin)
+BuildRequires: mvn(org.jboss.spec.javax.el:jboss-el-api_3.0_spec)
+BuildRequires: mvn(org.jboss.classfilewriter:jboss-classfilewriter)
+BuildRequires: mvn(org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec)
+BuildRequires: mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec)
+BuildRequires: mvn(org.jboss:jboss-vfs)
 
 %description
 Weld is the reference implementation (RI) for JSR-299: Java Contexts and
@@ -57,17 +51,12 @@ for dependency injection and contextual lifecycle management, and integrates
 cleanly with the Java EE platform. Any Java EE 6-compliant application server
 provides support for JSR-299 (even the web profile). 
 
-
 %package javadoc
 Summary: Javadocs for %{name}
-Group: Documentation
-Requires: jpackage-utils
-
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
-
 %prep
 %setup -q -n core-%{namedversion}
 
@@ -78,61 +67,38 @@ find . -name '*.class' -exec rm {} \;
 %pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
 
 # We don't want to build these modules
-%pom_disable_module porting-package
+%pom_disable_module porting-package/1.1
 %pom_disable_module tests
 %pom_disable_module tests-arquillian
 %pom_disable_module inject-tck-runner
-%pom_disable_module jboss-tck-runner
+%pom_disable_module jboss-tck-runner/1.1
 
 # Don't ship or run checkstyle configuration, see rhbz #825355
-%pom_remove_dep org.jboss.weld:weld-build-config
-%pom_disable_module build-config
 %pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
 
 # Disable envs that are not needed
 %pom_disable_module environments/servlet
 
+# Remove unnecessary at this point environents
+rm -rf environments/servlet/core/src/main/java/org/jboss/weld/environment/jetty
+rm -rf environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat
+rm -rf environments/servlet/core/src/main/java/org/jboss/weld/environment/tomcat7
 
 %build
-mvn-rpmbuild install javadoc:aggregate
-
+%mvn_build -f
 
 %install
+%mvn_install
 
-# Jar files:
-install -d -m 755 %{buildroot}%{_javadir}
-install -pm 644 impl/target/weld-core-%{namedversion}.jar \
-  %{buildroot}%{_javadir}/weld-core.jar
-install -pm 644 environments/se/core/target/weld-se-core-%{namedversion}.jar \
-  %{buildroot}%{_javadir}/weld-se-core.jar
-
-# POM files:
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-parent.pom
-install -pm 644 impl/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 environments/se/core/pom.xml %{buildroot}%{_mavenpomdir}/JPP-weld-se-core.pom
-
-# Dependencies map:
-%add_maven_depmap JPP-%{name}-parent.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-%add_maven_depmap JPP-weld-se-core.pom weld-se-core.jar
-
-# Javadoc files:
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Thu Jul 25 2013 Marek Goldmann <mgoldman at redhat.com> - 2.0.2-1
+- Upstream release 2.0.2.Final, RHBZ#983233
+
 * Wed Jul 24 2013 Marek Goldmann <mgoldman at redhat.com> - 1.1.13-2.Final
 - Use the old cdi-api in version 1.0