diff --git a/jaxen-xom-dep.patch b/jaxen-xom-dep.patch deleted file mode 100644 index 17085dc..0000000 --- a/jaxen-xom-dep.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/project.xml b/project.xml -index 322ec3f..9f4cbc6 100644 ---- a/project.xml -+++ b/project.xml -@@ -288,12 +288,6 @@ - - - -- xom -- xom -- 1.0 -- -- -- - maven-plugins - maven-cobertura-plugin - 1.3 diff --git a/jaxen.spec b/jaxen.spec index 39b5cd5..882d552 100644 --- a/jaxen.spec +++ b/jaxen.spec @@ -30,7 +30,7 @@ Name: jaxen Version: 1.1.3 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 Summary: An XPath engine written in Java License: BSD @@ -39,7 +39,6 @@ Group: Development/Libraries Source0: http://dist.codehaus.org/jaxen/distributions/jaxen-%{version}-src.tar.gz Source1: build.xml Source2: http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom -Patch0: %{name}-xom-dep.patch Requires: dom4j >= 0:1.6.1 Requires: jdom >= 0:1.0-0.rc1.1jpp Requires: xalan-j2 @@ -76,7 +75,6 @@ Group: Development/Documentation %prep %setup -q -%patch0 -p1 find . -name "*.jar" -exec rm -f {} \; cp %{SOURCE1} . cp %{SOURCE2} pom.xml @@ -87,7 +85,7 @@ ln -s %{_javadir}/xerces-j2.jar xercesImpl-2.6.2.jar popd rm -rf src/java/main/org/jaxen/xom rm src/java/test/org/jaxen/test/XOM*.java - +%pom_remove_dep xom:xom %pom_remove_dep :maven-cobertura-plugin %pom_remove_dep :maven-findbugs-plugin @@ -128,6 +126,10 @@ install -p -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom %{_datadir}/%{name}-%{version} %changelog +* Wed Nov 28 2012 Mikolaj Izdebski - 0:1.1.3-8 +- Remove xom dependency from POM +- Resolves: rhbz#880970 + * Tue Nov 27 2012 Mikolaj Izdebski - 0:1.1.3-7 - Remove unneeded dependency from POM: maven-cobertura-plugin - Remove unneeded dependency from POM: maven-findbugs-plugin