[jbossws-common/f17: 2/2] - Added jbossws-parent BR - Enabled tests - Removed patch - Using pom macros

[Marek Goldmann]

commit c6e7fd9a194df16aff93c24282d84f0675b17cd2
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Tue Oct 9 10:08:51 2012 +0200

    - Added jbossws-parent BR
    - Enabled tests
    - Removed patch
    - Using pom macros

 jbossws-common-2.0.4.GA-pom.patch |   45 -------------------------------------
 jbossws-common.spec               |   32 ++++++++++++--------------
 2 files changed, 15 insertions(+), 62 deletions(-)
---
diff --git a/jbossws-common.spec b/jbossws-common.spec
index de6806e..bb6014c 100644
--- a/jbossws-common.spec
+++ b/jbossws-common.spec
@@ -3,7 +3,7 @@
 
 Name:             jbossws-common
 Version:          2.0.4
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          JBossWS Common
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -11,10 +11,7 @@ URL:              http://www.jboss.org/jbossws
 
 # svn export http://anonsvn.jboss.org/repos/jbossws/common/tags/jbossws-common-2.0.4.GA/ jbossws-common-2.0.4.GA
 # tar cafJ jbossws-common-2.0.4.GA.tar.xz jbossws-common-2.0.4.GA
-
-Source0:          %{name}-%{namedversion}.tar.xz
-
-Patch0:           %{name}-%{namedversion}-pom.patch
+Source0:          jbossws-common-%{namedversion}.tar.xz
 
 BuildArch:        noarch
 
@@ -35,6 +32,7 @@ BuildRequires:    jboss-jms-1.1-api
 BuildRequires:    jboss-servlet-3.0-api
 BuildRequires:    jbossws-api
 BuildRequires:    jbossws-spi
+BuildRequires:    jbossws-parent
 BuildRequires:    jboss-logging
 BuildRequires:    wsdl4j
 
@@ -63,23 +61,17 @@ Requires:         jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
+%setup -q -n jbossws-common-%{namedversion}
 
-%patch0 -p1
+# Add jaxrpc dependency, since it's required
+%pom_xpath_inject "pom:dependencies" "<dependency><groupId>org.jboss.spec.javax.xml.rpc</groupId><artifactId>jboss-jaxrpc-api_1.1_spec</artifactId><version>1.0.1.Final</version></dependency>"
 
-# Message.properties files are not included in jar, make it available
-for file in $(find src/ -name '*.properties'); do
-  dest=$(echo $file | sed s/\\/java\\//\\/resources\\//)
-  dir=$(dirname $dest)
-  mkdir -p $dir
-  cp $file $dest
-done
+# Update the jboss logging dependency to new artifact
+sed -i "s|<artifactId>jboss-logging-spi</artifactId>|<artifactId>jboss-logging</artifactId>|" pom.xml
 
 %build
-# many tests fail
 mvn-rpmbuild \
     -Dproject.build.sourceEncoding=UTF-8 \
-    -Dmaven.test.skip=true \
     install javadoc:aggregate
 
 %install
@@ -88,7 +80,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # JAR
-install -pm 644 target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -pm 644 target/jbossws-common-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # POM
 install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
@@ -108,6 +100,12 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct 09 2012 Marek Goldmann <mgoldman at redhat.com> - 2.0.4-5
+- Added jbossws-parent BR
+- Enabled tests
+- Removed patch
+- Using pom macros
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild