[spice-parent] Add pom.patch

Hui Wang huwang at fedoraproject.org
Thu Sep 9 09:03:11 UTC 2010


commit 4521805f08d7a1e5b888ed23e7f043137ba90c6b
Author: Hui Wang <huwang at dhcp-65-188.nay.redhat.com>
Date:   Thu Sep 9 17:01:30 2010 +0800

    Add pom.patch

 pom.patch         |   14 ++++++++++++++
 spice-parent.spec |    8 +++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/pom.patch b/pom.patch
new file mode 100644
index 0000000..eb12440
--- /dev/null
+++ b/pom.patch
@@ -0,0 +1,14 @@
+--- pom.xml.orig	2010-01-19 10:00:55.000000000 +0800
++++ pom.xml	2010-09-09 16:51:11.000000000 +0800
+@@ -228,11 +228,6 @@
+               <artifactId>maven-plugin-tools-javadoc</artifactId>
+               <version>2.5</version>
+             </tagletArtifact>
+-            <tagletArtifact>
+-              <groupId>org.codehaus.plexus</groupId>
+-              <artifactId>plexus-javadoc</artifactId>
+-              <version>1.0</version>
+-            </tagletArtifact>
+           </tagletArtifacts>
+         </configuration>
+       </plugin>
diff --git a/spice-parent.spec b/spice-parent.spec
index 66c21f1..a307756 100644
--- a/spice-parent.spec
+++ b/spice-parent.spec
@@ -1,6 +1,6 @@
 Name:           spice-parent
 Version:        15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Sonatype Spice Components
 
 Group:          Development/Libraries
@@ -9,6 +9,7 @@ URL:            http://svn.sonatype.org/spice/tags/spice-parent-15
 #svn export http://svn.sonatype.org/spice/tags/spice-parent-15 spice-parent-15
 #tar zcf spice-parent-15.tar.gz spice-parent-15/
 Source0:        %{name}-%{version}.tar.gz
+Patch0:        pom.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -25,6 +26,8 @@ used throughout the Sonatype Forge.
 
 %prep
 %setup -q -n %{name}-%{version}
+#Remove plexus-javadoc
+%patch0
 
 %build
 #nothing to do for the pom
@@ -54,6 +57,9 @@ rm -rf %{buildroot}
 %{_mavendepmapfragdir}/*
 
 %changelog
+* Thu Sep 09 2010 Hui Wang <huwang at redhat.com> - 15-3
+- Add pom.patch 
+
 * Fri May 14 2010 Hui Wang <huwang at redhat.com> - 15-2
 - Add instruction which create Source0 as a commont
 - Use macros in Source0 


More information about the scm-commits mailing list