[mule] Various FTBFS-related fixes

Andy Grimm arg at fedoraproject.org
Sat Feb 23 01:50:39 UTC 2013


commit 600e183fecaedd87a943fb1254e529193570b7bb
Author: Andy Grimm <agrimm at gmail.com>
Date:   Fri Feb 22 20:50:36 2013 -0500

    Various FTBFS-related fixes

 mule-remove-wagon-webdav-extension.patch |   17 +++++++++++++++++
 mule.spec                                |   12 +++++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/mule-remove-wagon-webdav-extension.patch b/mule-remove-wagon-webdav-extension.patch
new file mode 100644
index 0000000..e4fb91a
--- /dev/null
+++ b/mule-remove-wagon-webdav-extension.patch
@@ -0,0 +1,17 @@
+--- mule-2.0.2.20080813/pom.xml.orig	2012-12-10 14:16:29.000000000 -0500
++++ mule-2.0.2.20080813/pom.xml	2013-02-22 19:56:11.093121086 -0500
+@@ -764,14 +764,6 @@
+     <build>
+         <defaultGoal>install</defaultGoal>
+ 
+-        <extensions>
+-            <!-- WebDAV for remote deployment -->
+-            <extension>
+-                <groupId>org.apache.maven.wagon</groupId>
+-                <artifactId>wagon-webdav</artifactId>
+-            </extension>
+-        </extensions>
+-
+         <!-- specify versions of the plugins used in child poms here -->
+         <pluginManagement>
+             <plugins>
diff --git a/mule.spec b/mule.spec
index a321fd8..2e03f50 100644
--- a/mule.spec
+++ b/mule.spec
@@ -6,7 +6,7 @@
 
 Name: mule
 Version: 2.0.2.20080813
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Mule Enterprise Service Bus Java libraries
 License: CPAL
 Group: Development/Libraries
@@ -39,11 +39,14 @@ Patch10: mule-mx4j.patch
 Patch11: mule-spring31.patch
 # Remove backport-util-concurrent dep
 Patch12: mule-no-backport.patch
+# Remove use of wagon-webdav extension (RHBZ#914200)
+Patch13: mule-remove-wagon-webdav-extension.patch
 
 BuildArch: noarch
 BuildRequires: jpackage-utils
 BuildRequires: java-devel >= 1.5.0
 BuildRequires: maven-local
+BuildRequires: maven-shared
 BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-plugin-cobertura
 BuildRequires: maven-eclipse-plugin
@@ -64,6 +67,7 @@ BuildRequires: tomcat6-servlet-2.5-api
 BuildRequires: geronimo-jaxrpc
 BuildRequires: geronimo-jms
 BuildRequires: geronimo-jta
+BuildRequires: geronimo-parent-poms
 BuildRequires: groovy
 BuildRequires: jaxen
 BuildRequires: java-service-wrapper
@@ -73,6 +77,7 @@ BuildRequires: jboss-j2eemgmt-1.1-api
 BuildRequires: log4j
 BuildRequires: mx4j
 BuildRequires: quartz
+BuildRequires: saxon
 BuildRequires: slf4j
 BuildRequires: %{spring}-aop
 BuildRequires: %{spring}-beans
@@ -409,6 +414,7 @@ This package contains the API documentation for %{name}.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 # Fix java-service-wrapper link to match arch
 if [ \! -d /usr/lib64/java-service-wrapper ]; then
@@ -601,6 +607,10 @@ cp -rpf target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Feb 22 2013 Andy Grimm <agrimm at gmail.com> - 2.0.2.20080813-10
+- Add several BuildRequires (RHBZ#914200)
+- Patch out wagon-webdav extension usage
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2.20080813-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list