[jaxen/f17] Removed XOM support
Tomas Radej
tradej at fedoraproject.org
Mon Feb 27 17:16:55 UTC 2012
commit dece9d180983abace5920cdcdeced44020ffec5b
Author: Tomas Radej <tradej at redhat.com>
Date: Mon Feb 27 16:57:50 2012 +0100
Removed XOM support
jaxen.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/jaxen.spec b/jaxen.spec
index ce32d48..37a23d1 100644
--- a/jaxen.spec
+++ b/jaxen.spec
@@ -30,7 +30,7 @@
Name: jaxen
Version: 1.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 0
Summary: An XPath engine written in Java
License: BSD
@@ -42,14 +42,12 @@ Requires: dom4j >= 0:1.6.1
Requires: jdom >= 0:1.0-0.rc1.1jpp
Requires: xalan-j2
Requires: xerces-j2
-Requires: xom
BuildRequires: ant >= 0:1.6, jpackage-utils >= 0:1.6, junit, ant-junit
BuildRequires: java-devel
BuildRequires: dom4j >= 0:1.6.1
BuildRequires: jdom >= 0:1.0-0.rc1.1jpp
BuildRequires: xalan-j2
BuildRequires: xerces-j2
-BuildRequires: xom
Provides: jaxen-bootstrap <= %{version}-%{release}
Obsoletes: jaxen-bootstrap <= %{version}-%{release}
BuildArch: noarch
@@ -80,9 +78,11 @@ find . -name "*.jar" -exec rm -f {} \;
cp %{SOURCE1} .
mkdir -p target/lib
pushd target/lib
-build-jar-repository . dom4j-1.6.1.jar jdom-1.0.jar xom-1.0.jar
+build-jar-repository . dom4j-1.6.1.jar jdom-1.0.jar
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
%build
mkdir .maven
@@ -114,6 +114,9 @@ cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/samples
%{_datadir}/%{name}-%{version}
%changelog
+* Mon Feb 27 2012 Tomas Radej <tradej at redhat.com> - 0:1.1.3-3
+- Removed XOM support (bz #785007)
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list