[msv] - Fix depmaps and install jars required by msv.pom.
Alexander Kurtakov
akurtakov at fedoraproject.org
Thu Oct 28 19:21:23 UTC 2010
commit 93f3efe5613c2bc45763b1065e02420e7e5fc983
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Thu Oct 28 22:20:52 2010 +0300
- Fix depmaps and install jars required by msv.pom.
msv.spec | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/msv.spec b/msv.spec
index 002859b..c1f9552 100644
--- a/msv.spec
+++ b/msv.spec
@@ -1,7 +1,7 @@
Name: msv
Epoch: 1
Version: 2009.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Multi-Schema Validator
Group: Development/Libraries
License: BSD
@@ -31,7 +31,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-plugin-build-helper
BuildRequires: isorelax
@@ -212,6 +212,8 @@ install -pD -T generator/target/%{name}-generator-%{version}.jar \
%{buildroot}%{_javadir}/%{name}-generator-%{version}.jar
install -pD -T xsdlib/target/xsdlib-%{version}.jar \
%{buildroot}%{_javadir}/xsdlib-%{version}.jar
+install -pD -T testharness/target/%{name}-testharness-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}-testharness-%{version}.jar
# Alternate jar names
ln -s %{name}-core-%{version}.jar \
@@ -236,6 +238,7 @@ install -pD -T -m 644 msv/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-c
install -pD -T -m 644 relames/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-relames.pom
install -pD -T -m 644 rngconverter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-rngconverter.pom
install -pD -T -m 644 generator/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-generator.pom
+install -pD -T -m 644 testharness/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-testharness.pom
install -pD -T -m 644 xsdlib/pom.xml %{buildroot}%{_mavenpomdir}/JPP-xsdlib.pom
%add_to_maven_depmap net.java.dev.msv msv %{version} JPP msv
%add_to_maven_depmap net.java.dev.msv msv-parent %{version} JPP msv-parent
@@ -243,7 +246,10 @@ install -pD -T -m 644 xsdlib/pom.xml %{buildroot}%{_mavenpomdir}/JPP-xsdli
%add_to_maven_depmap net.java.dev.msv msv-relames %{version} JPP msv-relames
%add_to_maven_depmap net.java.dev.msv msv-rngconverter %{version} JPP msv-rngconverter
%add_to_maven_depmap net.java.dev.msv msv-generator %{version} JPP msv-generator
+%add_to_maven_depmap net.java.dev.msv msv-testharness %{version} JPP msv-testharness
%add_to_maven_depmap net.java.dev.msv xsdlib %{version} JPP xsdlib
+%add_to_maven_depmap msv msv %{version} JPP msv-core
+%add_to_maven_depmap com.sun.msv.datatype.xsd xsdlib %{version} JPP xsdlib
# Javadocs
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
@@ -279,19 +285,21 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib
%clean
rm -rf %{buildroot}
-%post
+%post xsdlib
%update_maven_depmap
-%postun
+%postun xsdlib
%update_maven_depmap
%files msv
%defattr(-,root,root,-)
%{_mavenpomdir}/JPP-%{name}-core.pom
+%{_mavenpomdir}/JPP-%{name}-testharness.pom
%{_javadir}/%{name}-core-%{version}.jar
%{_javadir}/%{name}-core.jar
%{_javadir}/%{name}-msv-%{version}.jar
%{_javadir}/%{name}-msv.jar
+%{_javadir}/%{name}-testharness*
%doc msv/doc/license.txt
%files relames
@@ -351,6 +359,9 @@ rm -rf %{buildroot}
%{_datadir}/%{name}-%{version}
%changelog
+* Thu Oct 28 2010 Alexander Kurtakov <akurtako at redhat.com> 1:2009.1-5
+- Fix depmaps and install jars required by msv.pom.
+
* Fri Sep 24 2010 Mat Booth <fedora at matbooth.co.uk> - 1:2009.1-4
- Really require a version of xml-commons-resolver that provides the necessary
maven pom and depmap.
More information about the scm-commits
mailing list