[ws-commons-util] Patch pom.xml to remove maven-eclipse-plugin

[Stanislav Ochotnicky]

commit 4b82354465423444d753f00ec19be41aeffda9b2
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Apr 19 10:24:37 2012 +0200

    Patch pom.xml to remove maven-eclipse-plugin
    
    - Add missing java and jpackage-utils requires

 ws-commons-util-maven-eclipse-plugin.patch |   16 ++++++++++++++++
 ws-commons-util.spec                       |   14 ++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/ws-commons-util-maven-eclipse-plugin.patch b/ws-commons-util-maven-eclipse-plugin.patch
new file mode 100644
index 0000000..b06f350
--- /dev/null
+++ b/ws-commons-util-maven-eclipse-plugin.patch
@@ -0,0 +1,16 @@
+--- pom.xml~	2012-04-19 10:17:38.236778600 +0200
++++ pom.xml	2012-04-19 10:17:24.795779054 +0200
+@@ -71,13 +71,6 @@
+ 			    </configuration>
+ 			</plugin>
+             <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-eclipse-plugin</artifactId>
+-                <configuration>
+-                    <downloadSources>true</downloadSources>
+-                </configuration>
+-            </plugin>
+-            <plugin>
+                 <inherited>true</inherited>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-source-plugin</artifactId>
diff --git a/ws-commons-util.spec b/ws-commons-util.spec
index 86240a2..4ef6654 100644
--- a/ws-commons-util.spec
+++ b/ws-commons-util.spec
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Common utilities from the Apache Web Services Project
 
 Group:          System Environment/Libraries
@@ -8,6 +8,9 @@ License:        ASL 2.0
 URL:            http://apache.osuosl.org/ws/commons/util/
 Source0:        http://apache.osuosl.org/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
 Patch0:         %{name}-addosgimanifest.patch
+# Remove maven-eclipse-plugin from build dependencies to simplify the
+# dependency chain.
+Patch1:         %{name}-maven-eclipse-plugin.patch
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 1.5
@@ -21,12 +24,14 @@ BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven-eclipse-plugin
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  junit
 BuildRequires:  java-javadoc
 
+Requires:       java
+Requires:       jpackage-utils
+
 %description
 This is version 1.0.1 of the common utilities from the Apache Web
 Services Project.
@@ -42,6 +47,7 @@ Requires:       jpackage-utils
 %prep
 %setup -q -n %{name}-%{version}
 %patch0
+%patch1
 
 %build
 mvn-rpmbuild install javadoc:javadoc
@@ -70,6 +76,10 @@ cp -pR target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Apr 19 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0.1-22
+- Patch pom.xml to remove maven-eclipse-plugin
+- Add missing java and jpackage-utils requires
+
 * Tue Apr 17 2012 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-21
 - Fix OSGi manifest.
 - Adapt to current guidelines.