[xbean] Convert patch to POM macros
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Mon Jul 16 08:37:35 UTC 2012
commit 6b26146e79a5301bae5be591903c717091bfd7a4
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri Jul 13 12:37:33 2012 +0200
Convert patch to POM macros
pom-3.8.patch | 114 ---------------------------------------------------------
xbean.spec | 27 ++++++++++---
2 files changed, 21 insertions(+), 120 deletions(-)
---
diff --git a/xbean.spec b/xbean.spec
index cb08333..557f1b3 100644
--- a/xbean.spec
+++ b/xbean.spec
@@ -16,8 +16,6 @@ URL: http://geronimo.apache.org/xbean/
Source0: xbean-%{version}.tar.xz
Source1: xbean.depmap
-Patch0: pom-%{version}.patch
-
BuildRequires: java-devel
BuildRequires: apache-commons-beanutils
BuildRequires: apache-commons-logging
@@ -70,11 +68,28 @@ Requires: jpackage-utils
# build failing on this due to doxia-sitetools problems
rm src/site/site.xml
-# removes dependency on springframework and prevents building of
-# modules depending on it. If other modules are required,
-# springframework will have to be brought in first
-%patch0 -p1
-
+%pom_xpath_remove "pom:parent"
+%pom_remove_dep org.springframework:
+%pom_remove_dep mx4j:mx4j
+%pom_remove_dep :xbean-asm-shaded xbean-reflect
+
+# Prevent modules depending on springframework from building.
+%pom_disable_module xbean-asm-shaded
+%pom_disable_module xbean-blueprint
+%pom_disable_module xbean-classloader
+%pom_disable_module xbean-finder-shaded
+%pom_disable_module xbean-spring
+%pom_disable_module xbean-telnet
+%pom_disable_module maven-xbean-plugin
+
+%pom_xpath_inject "pom:build/pom:plugins" "
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>"
# Fix dependency on xbean-asm-shaded to original objectweb-asm
sed -i 's/org.apache.xbean.asm/org.objectweb.asm/' \
More information about the scm-commits
mailing list