[apache-commons-parent] Added patch to remove commons-build-plugin from pom file
spike
spike at fedoraproject.org
Sun Nov 7 05:22:17 UTC 2010
commit 476436dc60f1cd748853c063bfa5c2ac1397864d
Author: spike <spike at fedoraproject.org>
Date: Sun Nov 7 06:21:22 2010 +0100
Added patch to remove commons-build-plugin from pom file
apache-commons-parent-remove-build-plugin.patch | 43 +++++++++++++++++++++++
apache-commons-parent.spec | 10 ++++-
2 files changed, 51 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-parent-remove-build-plugin.patch b/apache-commons-parent-remove-build-plugin.patch
new file mode 100644
index 0000000..2acbea3
--- /dev/null
+++ b/apache-commons-parent-remove-build-plugin.patch
@@ -0,0 +1,43 @@
+--- pom.xml 2010-04-20 03:00:29.000000000 +0200
++++ pom.xml 2010-11-06 15:59:59.509445003 +0100
+@@ -251,14 +251,6 @@
+ </plugin>
+ <!-- Other plugins, alpha order by groupId and artifactId -->
+ <plugin>
+- <groupId>org.apache.commons</groupId>
+- <artifactId>commons-build-plugin</artifactId>
+- <version>1.3</version>
+- <configuration>
+- <commons.release.name>${commons.release.name}</commons.release.name>
+- </configuration>
+- </plugin>
+- <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!-- version 1.4.x is required for JDK 1.4 compatibilty -->
+@@ -363,10 +355,6 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>org.apache.commons</groupId>
+- <artifactId>commons-build-plugin</artifactId>
+- </plugin>
+ </plugins>
+ </build>
+
+@@ -740,14 +728,6 @@
+ <commons.surefire.java />
+ <commons.surefire.version>2.5</commons.surefire.version>
+
+- <!-- Default values for the download-page generation by commons-build-plugin -->
+- <commons.release.name>${project.artifactId}-${commons.release.version}</commons.release.name>
+- <commons.release.desc />
+- <commons.binary.suffix>-bin</commons.binary.suffix>
+- <commons.release.2.name>${project.artifactId}-${commons.release.2.version}</commons.release.2.name>
+- <commons.release.2.desc />
+- <commons.release.2.binary.suffix>-bin</commons.release.2.binary.suffix>
+-
+ <!-- Commons Component Id -->
+ <commons.componentid>${project.artifactId}</commons.componentid>
+
diff --git a/apache-commons-parent.spec b/apache-commons-parent.spec
index 2c1f7f1..5a69a3d 100644
--- a/apache-commons-parent.spec
+++ b/apache-commons-parent.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 15
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Commons Parent Pom
Group: Development/Libraries
License: ASL 2.0
@@ -12,6 +12,9 @@ URL: http://svn.apache.org/repos/asf/commons/proper/%{short_name}/t
# svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-15
# tar caf commons-parent-15.tar.xz commons-parent-15
Source0: %{short_name}-%{version}.tar.xz
+
+#common-build-plugin not in fedora yet
+Patch1: %{name}-remove-build-plugin.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -40,6 +43,7 @@ The Project Object Model files for the apache-commons packages.
%prep
%setup -q -n %{short_name}-%{version}
+%patch1 -p0
%build
#nothing to do for the pom
@@ -69,6 +73,8 @@ rm -rf %{buildroot}
%{_mavendepmapfragdir}/*
%changelog
+* Sat Nov 6 2010 Chris Spike <chris.spike at arcor.de> 15-2
+- Added patch to remove commons-build-plugin from pom file
+
* Wed Oct 20 2010 Chris Spike <chris.spike at arcor.de> 15-1
- Initial version of the package
-
More information about the scm-commits
mailing list