[avalon-framework] Fixed xerces dep
Stanislav Ochotnicky
sochotni at fedoraproject.org
Wed Jun 6 12:25:38 UTC 2012
commit d0b79a2dabc70d56e9d5022272a93dd62bc96624
Author: Tomas Radej <tradej at redhat.com>
Date: Wed Jun 6 14:02:09 2012 +0200
Fixed xerces dep
avalon-framework-xerces.patch | 13 +++++++++++++
avalon-framework.spec | 7 ++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/avalon-framework-xerces.patch b/avalon-framework-xerces.patch
new file mode 100644
index 0000000..93f4f7e
--- /dev/null
+++ b/avalon-framework-xerces.patch
@@ -0,0 +1,13 @@
+diff --git a/avalon-framework-impl-4.3/avalon-framework-impl-4.3.pom b/avalon-framework-impl-4.3/avalon-framework-impl-4.3.pom
+index 1937459..28d8da8 100644
+--- a/avalon-framework-impl-4.3/avalon-framework-impl-4.3.pom
++++ b/avalon-framework-impl-4.3/avalon-framework-impl-4.3.pom
+@@ -17,7 +17,7 @@
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+- <artifactId>xerces</artifactId>
++ <artifactId>xercesImpl</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
diff --git a/avalon-framework.spec b/avalon-framework.spec
index f7e5948..9b7f436 100644
--- a/avalon-framework.spec
+++ b/avalon-framework.spec
@@ -33,7 +33,7 @@
Name: avalon-%{short_name}
Version: 4.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 0
Summary: Java components interfaces
License: ASL 2.0
@@ -48,6 +48,7 @@ Source3: http://repo1.maven.org/maven2/avalon-framework/%{name}-impl/%{versi
# remove jmock from dependencies because we don't have it
Patch0: %{name}-impl-pom.patch
+Patch1: %{name}-xerces.patch
Requires: apache-commons-logging
Requires: avalon-logkit
@@ -95,6 +96,7 @@ cp %{SOURCE2} .
pushd %{name}-impl-%{version}/
cp %{SOURCE3} .
%patch0
+%patch1 -p2
popd
%build
@@ -156,6 +158,9 @@ popd
%{_javadocdir}/%{name}
%changelog
+* Wed Jun 06 2012 Tomas Radej <tradej at redhat.com> - 0:4.3-6
+- Fixed xerces dep
+
* Fri Apr 6 2012 Alexander Kurtakov <akurtako at redhat.com> 0:4.3-5
- Remove unneeded BR/R.
More information about the scm-commits
mailing list