[jbosscache-core] Fixed pom file dependencies

Matt Spaulding madsa at fedoraproject.org
Tue Oct 2 01:55:20 UTC 2012


commit c48f858be4fb761e34db33f28c31656605ea98f9
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Mon Oct 1 18:53:59 2012 -0700

    Fixed pom file dependencies
    
    Remove custom depmap file (now using pom macros and editing pom file)
    Add license file to javadoc package

 jbosscache-core-depmap.xml |  101 --------------------------------------------
 jbosscache-core.spec       |   18 +++++++-
 2 files changed, 15 insertions(+), 104 deletions(-)
---
diff --git a/jbosscache-core.spec b/jbosscache-core.spec
index 6a495f8..6984845 100644
--- a/jbosscache-core.spec
+++ b/jbosscache-core.spec
@@ -1,6 +1,6 @@
 Name:       jbosscache-core
 Version:    3.2.8
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    JBoss objects cache
 
 Group:      Development/Libraries
@@ -9,7 +9,6 @@ URL:        http://jboss.org/jbosscache
 # svn export http://anonsvn.jboss.org/repos/jbosscache/core/tags/3.2.8.GA jbosscache-core-3.2.8
 # tar cJf jbosscache-core-3.2.8.tar.xz jbosscache-core-3.2.8
 Source0:    %{name}-%{version}.tar.xz
-Source1:    %{name}-depmap.xml
 Patch0:     %{name}-jgroups212.patch
 
 BuildRequires:  maven
@@ -60,15 +59,23 @@ Requires:  jpackage-utils
 %setup -q
 find . -name \*.jar -exec rm -f {} \;
 
+# Remove optional dependencies
+%pom_remove_dep com.sleepycat:je
+%pom_remove_dep net.noderunner:amazon-s3
+
 # Remove code for amazon-s3 and berkleydb-je dependencies
 rm -rf src/main/java/org/jboss/cache/loader/{s3,bdbje}
 
+# Fix JBoss transaction API dependency
+sed -i -e "s|<groupId>org.jboss.javaee</groupId>|<groupId>org.jboss.spec.javax.transaction</groupId>|" \
+    -e "s|<artifactId>jboss-transaction-api</artifactId>|<artifactId>jboss-transaction-api_1.1_spec</artifactId>|" \
+    -e "s|<version>1.0.1.GA</version>|<version>1.0.1-SNAPSHOT</version>|" pom.xml
+
 %patch0 -p1
 
 %build
 # Not running tests due to missing dependencies
 mvn-rpmbuild install -Dmaven.test.skip=true \
-    -Dmaven.local.depmap.file=%{SOURCE1} \
     -Dproject.build.sourceEncoding=UTF-8 \
     javadoc:aggregate
 
@@ -95,9 +102,14 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
+%doc src/main/release/LICENSE-lgpl-2.1.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Oct 01 2012 Matt Spaulding <mspaulding06 at gmail.com> - 3.2.8-5
+- Remove custom depmap file (now using pom macros and editing pom file)
+- Add license file to javadoc package
+
 * Thu Aug 23 2012 Matt Spaulding <mspaulding06 at gmail.com> - 3.2.8-4
 - Updated pom reference to jgroups to use jgroups212 instead
 


More information about the scm-commits mailing list