[jersey] fix for rhbz#1019234

[gil]

commit 0b132ec4887d8002c50f77dcc9271af452831a52
Author: gil <puntogil at libero.it>
Date:   Tue Oct 15 15:10:56 2013 +0200

    fix for rhbz#1019234

 jersey-1.17.1-remove-tools-scope-system.patch |   20 ++++++++++++++++++++
 jersey.spec                                   |   10 +++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/jersey-1.17.1-remove-tools-scope-system.patch b/jersey-1.17.1-remove-tools-scope-system.patch
new file mode 100644
index 0000000..5b9b045
--- /dev/null
+++ b/jersey-1.17.1-remove-tools-scope-system.patch
@@ -0,0 +1,20 @@
+--- contribs/wadl-resourcedoc-doclet/pom.xml	2013-10-15 14:03:41.680901424 +0200
++++ contribs/wadl-resourcedoc-doclet/pom.xml-gil	2013-10-15 14:04:59.799739389 +0200
+@@ -67,8 +67,6 @@
+                     <groupId>com.sun</groupId>
+                     <artifactId>tools</artifactId>
+                     <version>1.7.0</version>
+-                    <scope>system</scope>
+-                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                 </dependency>
+                 <dependency>
+                     <groupId>com.sun.jersey</groupId>
+@@ -93,8 +91,6 @@
+                     <groupId>com.sun</groupId>
+                     <artifactId>tools</artifactId>
+                     <version>1.6</version>
+-                    <scope>system</scope>
+-                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                 </dependency>
+                 <dependency>
+                     <groupId>com.sun.jersey</groupId>
diff --git a/jersey.spec b/jersey.spec
index 0d14b87..118dbb1 100644
--- a/jersey.spec
+++ b/jersey.spec
@@ -1,7 +1,7 @@
 %global with_grizzly 1
 Name:          jersey
 Version:       1.17.1
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       JAX-RS (JSR 311) production quality Reference Implementation
 # One file in jersey-core/ is under ASL 2.0 license
 License:       (CDDL or GPLv2 with exceptions) and ASL 2.0
@@ -30,6 +30,8 @@ Patch0:        %{name}-1.14-fixbuild.patch
 # change javax.servlet servlet-api 2.5 with org.jboss.spec.javax.servlet jboss-servlet-api_3.0_spec
 # change spring25-release-version [2.5.2,3) to 3
 Patch1:        %{name}-1.15-contribs-spring-pom.patch
+# Fix for rhbz#1019234
+Patch2:        %{name}-1.17.1-remove-tools-scope-system.patch
 
 BuildRequires: java-devel
 
@@ -139,6 +141,7 @@ This package contains javadoc for %{name}.
 
 %patch0 -p1
 %patch1 -p0
+%patch2 -p0
 
 # unavailable deps
 %pom_disable_module archetypes
@@ -241,6 +244,8 @@ jersey-test-framework/jersey-test-framework-core/pom.xml
 
 %build
 
+# Fix conflict with jersey-test-framework-core thanks to Mikolaj Izdebski
+%mvn_file :%{name}-test-framework %{name}/%{name}-test-framework-pom
 %mvn_file :%{name}-test-framework-core %{name}/%{name}-test-framework
 %mvn_file :%{name}-test-framework-core %{name}/%{name}-test-framework-core
 %mvn_package ":%{name}-test-framework" test-framework
@@ -294,6 +299,9 @@ install -p -m 644 ant-wadl-task %{buildroot}%{_sysconfdir}/ant.d/ant-wadl-task
 %doc license.html legal/LICENSE.txt legal/maintenance/copyright.txt LICENSE-2.0.txt
 
 %changelog
+* Tue Oct 15 2013 gil cattaneo <puntogil at libero.it> 1.17.1-6
+- fix for rhbz#1019234
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild