[jbossws-spi] - Add jbossws-parent BR - Use POM macros instead of patch - Enable tests

Marek Goldmann goldmann at fedoraproject.org
Tue Oct 9 08:48:30 UTC 2012


commit 0835f7a05c1e2e1e53e365552de34969538124b5
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Tue Oct 2 15:00:55 2012 +0200

    - Add jbossws-parent BR
    - Use POM macros instead of patch
    - Enable tests

 jbossws-spi-2.0.3.GA-pom.patch |   25 -------------------------
 jbossws-spi.spec               |   25 ++++++++++---------------
 2 files changed, 10 insertions(+), 40 deletions(-)
---
diff --git a/jbossws-spi.spec b/jbossws-spi.spec
index 001753b..9aed130 100644
--- a/jbossws-spi.spec
+++ b/jbossws-spi.spec
@@ -3,7 +3,7 @@
 
 Name:             jbossws-spi
 Version:          2.0.3
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          JBossWS SPI
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -13,8 +13,6 @@ URL:              http://www.jboss.org/jbossws
 # tar cafJ jbossws-spi-2.0.3.GA.tar.xz jbossws-spi-2.0.3.GA
 Source0:          %{name}-%{namedversion}.tar.xz
 
-Patch0:           %{name}-%{namedversion}-pom.patch
-
 BuildArch:        noarch
 
 BuildRequires:    jpackage-utils
@@ -28,6 +26,7 @@ BuildRequires:    jboss-jms-1.1-api
 BuildRequires:    jboss-logging
 BuildRequires:    jboss-servlet-3.0-api
 BuildRequires:    jbossws-api
+BuildRequires:    jbossws-parent
 
 Requires:         jpackage-utils
 Requires:         java
@@ -37,7 +36,7 @@ Requires:         jboss-servlet-3.0-api
 Requires:         jbossws-api
 
 %description
-JBoss WS SPI classes.
+JBoss WS SPI classes
 
 %package javadoc
 Summary:          Javadocs for %{name}
@@ -50,20 +49,11 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{namedversion}
 
-%patch0 -p1
-
-# 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
-# tests skipped because testParse fails
 mvn-rpmbuild \
-  -Dmaven.test.skip=true \
   -Dproject.build.sourceEncoding=UTF-8 \
   install javadoc:aggregate
 
@@ -93,6 +83,11 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct 02 2012 Marek Goldmann <mgoldman at redhat.com> - 2.0.3-4
+- Add jbossws-parent BR
+- Use POM macros instead of patch
+- Enable tests
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list