[jbossws-cxf] - Upstream release 4.2.0.CR1 - New guidelines

Mon Aug 5 13:15:30 UTC 2013

commit 912ca9376695880c13ea2a4075411df630775685
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Thu Jun 20 15:01:22 2013 +0200

    - Upstream release 4.2.0.CR1
    - New guidelines

 .gitignore       |    1 +
 jbossws-cxf.spec |   88 +++++++++++++++---------------------------------------
 sources          |    2 +-
 3 files changed, 26 insertions(+), 65 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f3cfbec..bff69e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /jbossws-cxf-4.0.2.GA-src.zip
 /jbossws-cxf-4.1.0.Final-src.zip
+/jbossws-cxf-4.2.0.CR1.tar.xz
diff --git a/jbossws-cxf.spec b/jbossws-cxf.spec
index a82c785..eb6221d 100644
--- a/jbossws-cxf.spec
+++ b/jbossws-cxf.spec
@@ -1,19 +1,19 @@
-%global namedreltag .Final
+%global namedreltag .CR1
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jbossws-cxf
-Version:          4.1.0
-Release:          5%{?dist}
+Version:          4.2.0
+Release:          0.1%{namedreltag}%{?dist}
 Summary:          JBoss Web Services CXF stack
-Group:            Development/Libraries
 License:          LGPLv2+
 URL:              http://www.jboss.org/jbossws
-Source0:          http://download.jboss.org/jbossws/jbossws-cxf-%{namedversion}-src.zip
+
+# svn export http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4.2.0.CR1/
+# tar cafJ jbossws-cxf-4.2.0.CR1.tar.xz jbossws-cxf-4.2.0.CR1
+Source0:          jbossws-cxf-%{namedversion}.tar.xz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
-BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
 BuildRequires:    maven-install-plugin
@@ -21,44 +21,33 @@ BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-enforcer-plugin
 BuildRequires:    maven-dependency-plugin
+BuildRequires:    maven-plugin-build-helper
 BuildRequires:    jaxws-jboss-httpserver-httpspi
 BuildRequires:    jboss-jms-1.1-api
 BuildRequires:    jboss-ejb-3.1-api
 BuildRequires:    jboss-jaxb-2.2-api
 BuildRequires:    jboss-saaj-1.3-api
 BuildRequires:    jbossws-parent
+BuildRequires:    jbossws-spi
 BuildRequires:    jbossws-common-tools
 BuildRequires:    picketbox
-BuildRequires:    cxf >= 2.6.3
-BuildRequires:    cxf-services >= 2.6.3
+BuildRequires:    cxf
+BuildRequires:    cxf-services
+BuildRequires:    cxf-xjc-utils
 BuildRequires:    opensaml-java-parent
 BuildRequires:    jbossws-common >= 2.1.0
 
-Requires:         jpackage-utils
-Requires:         java
-Requires:         jaxws-jboss-httpserver-httpspi
-Requires:         jboss-jms-1.1-api
-Requires:         jboss-ejb-3.1-api
-Requires:         jboss-jaxb-2.2-api
-Requires:         jboss-saaj-1.3-api
-Requires:         picketbox
-Requires:         cxf >= 2.6.3
-Requires:         cxf-services >= 2.6.3
-Requires:         jbossws-common >= 2.1.0
-
 %description
 JBoss Web Services CXF integration stack
 
 %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 jbossws-cxf-src-dist
+%setup -q -n jbossws-cxf-%{namedversion}
 
 %pom_remove_dep "org.springframework:spring-asm" modules/addons/transports/http/httpserver/pom.xml
 %pom_remove_dep "org.springframework:spring-asm" modules/client/pom.xml
@@ -68,53 +57,24 @@ This package contains the API documentation for %{name}.
 %pom_remove_dep "javax.jws:jsr181-api" modules/client/pom.xml
 %pom_remove_dep "javax.jws:jsr181-api" modules/server/pom.xml
 
+%pom_disable_module modules/testsuite
+
 %build
-# EasyMock Class Extension not available
-mvn-rpmbuild -Dmaven.test.skip=true -Dno-testsuite -Pjboss711 package javadoc:aggregate
+%mvn_build -f
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-for m in resources client server
-do
-  # JAR
-  install -pm 644 modules/${m}/target/jbossws-cxf-${m}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar
-
-  # POM
-  install -pm 644 modules/${m}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
-
-  # DEPMAP
-  %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar
-done
+%mvn_install
 
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-install -pm 644 modules/endorsed/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-factories.pom
-install -pm 644 modules/addons/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-addons.pom
-install -pm 644 modules/addons/transports/http/httpserver/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-transports-httpserver.pom
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-install -pm 644 modules/resources/target/jbossws-cxf-resources-%{namedversion}-jboss711.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-resources-jboss711.jar
-install -pm 644 modules/addons/transports/http/httpserver/target/jbossws-cxf-transports-httpserver-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-transports-httpserver.jar
-install -pm 644 modules/endorsed/target/jbossws-cxf-factories-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-factories.jar
-
-%add_maven_depmap JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}-addons.pom
-%add_maven_depmap JPP.%{name}-%{name}-factories.pom %{name}/%{name}-factories.jar
-%add_maven_depmap JPP.%{name}-%{name}-transports-httpserver.pom %{name}/%{name}-transports-httpserver.jar
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Aug 05 2013 Marek Goldmann <mgoldman at redhat.com> - 4.2.0-0.1.CR1
+- Upstream release 4.2.0.CR1
+- New guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 0c03c5d..4bd869a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11985a166c9fcbe1219f68e2d5dec71f  jbossws-cxf-4.1.0.Final-src.zip
+bb7b6fca724d5d556bb4b14e52639d4e  jbossws-cxf-4.2.0.CR1.tar.xz
