From 36dfd887342d294cf5b0335ebfe6dd8ac02c904c Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Apr 24 2015 14:48:41 +0000 Subject: Fix optional deps in OSGi manifest --- diff --git a/.gitignore b/.gitignore index 203d7f0..5b23633 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -commons-jxpath-1.3-src.tar.gz +/commons-jxpath-1.3-src.tar.gz +/.build-*.log +/noarch +/*.src.rpm diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec index 8530343..37137ef 100644 --- a/apache-commons-jxpath.spec +++ b/apache-commons-jxpath.spec @@ -1,6 +1,6 @@ Name: apache-commons-jxpath Version: 1.3 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Simple XPath interpreter License: ASL 2.0 URL: http://commons.apache.org/jxpath/ @@ -39,6 +39,9 @@ This package contains the API documentation for %{name}. %mvn_file ":{*}" %{name} @1 %mvn_alias : org.apache.commons: +%pom_xpath_inject 'pom:properties' \ + 'org.apache.commons.beanutils;resolution:="optional",org.jdom*;resolution:="optional",org.w3c.dom;resolution:="optional",*' + %build # we are skipping tests because we don't have com.mockrunner in repos yet %mvn_build -f @@ -53,6 +56,9 @@ This package contains the API documentation for %{name}. %license LICENSE.txt NOTICE.txt %changelog +* Fri Apr 24 2015 Mat Booth - 1.3-23 +- Fix optional deps in OSGi manifest + * Tue Apr 14 2015 Mikolaj Izdebski - 1.3-22 - Cleanup spec file