From b3a208ae38f7f0f4c64ef513b33c40365b47b61d Mon Sep 17 00:00:00 2001 From: mbooth Date: Sun, 19 Sep 2010 19:38:02 +0100 Subject: [PATCH] - Install a maven pom and depmap. --- xml-commons-resolver-MANIFEST.MF | 4 ++-- xml-commons-resolver-pom.xml | 38 ++++++++++++++++++++++++++++++++ xml-commons-resolver.spec | 24 ++++++++++++++++++-- 3 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 xml-commons-resolver-pom.xml diff --git a/xml-commons-resolver-MANIFEST.MF b/xml-commons-resolver-MANIFEST.MF index 7580de8..6eaee2a 100644 --- a/xml-commons-resolver-MANIFEST.MF +++ b/xml-commons-resolver-MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.2 Main-Class: org.apache.xml.resolver.apps.resolver Bundle-SymbolicName: org.apache.xml.resolver Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 +Bundle-Name: XML Commons Resolver Bundle-Localization: plugin Bundle-Version: 1.2.0.v200806030312 -Bundle-Vendor: %Bundle-Vendor.0 +Bundle-Vendor: Apache Software Foundation Require-Bundle: system.bundle Export-Package: org.apache.env,org.apache.xml.resolver,org.apache.xml. resolver.apps,org.apache.xml.resolver.etc,org.apache.xml.resolver.hel diff --git a/xml-commons-resolver-pom.xml b/xml-commons-resolver-pom.xml new file mode 100644 index 0000000..c6093a4 --- /dev/null +++ b/xml-commons-resolver-pom.xml @@ -0,0 +1,38 @@ + + + apache + org.apache + 3 + + 4.0.0 + xml-resolver + xml-resolver + XML Commons Resolver Component + 1.2 + xml-commons provides an Apache-hosted set of DOM, SAX, and + JAXP interfaces for use in other xml-based projects. Our hope is that we + can standardize on both a common version and packaging scheme for these + critical XML standards interfaces to make the lives of both our developers + and users easier. + http://xml.apache.org/commons/components/resolver/ + + bugzilla + http://issues.apache.org/bugzilla/ + + + + XML Commons Developer's List + commons-dev-subscribe@xml.apache.org + commons-dev-unsubscribe@xml.apache.org + commons-dev@xml.apache.org + http://mail-archives.apache.org/mod_mbox/xml-commons-dev/ + + + + scm:svn:http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-resolver-1_2/ + http://svn.apache.org/viewvc/xml/commons/tags/xml-commons-resolver-1_2/ + + + deployed + + \ No newline at end of file diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index c00808f..7047f1d 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,6 +1,6 @@ Name: xml-commons-resolver Version: 1.2 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Resolver subproject of xml-commons License: ASL 1.1 @@ -10,11 +10,15 @@ Source1: xml-commons-resolver-resolver.sh Source2: xml-commons-resolver-xread.sh Source3: xml-commons-resolver-xparse.sh Source4: %{name}-MANIFEST.MF +Source5: %{name}-pom.xml Requires: xml-commons-apis +Requires: jpackage-utils +Requires(post): jpackage-utils +Requires(postun): jpackage-utils BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant -BuildRequires: jpackage-utils >= 0:1.5 +BuildRequires: jpackage-utils BuildRequires: dos2unix #BuildRequires: %{_bindir}/xsltproc #BuildRequires: docbook-style-xsl @@ -28,6 +32,7 @@ Resolver subproject of xml-commons. %package javadoc Summary: Javadoc for %{name} Group: Documentation +Requires: jpackage-utils # for /bin/rm and /bin/ln Requires(post): coreutils Requires(postun): coreutils @@ -84,9 +89,19 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xml-resolver cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/xml-xread cp %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xml-xparse +# Pom +install -pD -T -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-xml-resolver.pom +%add_to_maven_depmap xml-resolver xml-resolver %{version} JPP xml-resolver + %clean rm -rf $RPM_BUILD_ROOT +%post +%update_maven_depmap + +%postun +%update_maven_depmap + %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} @@ -99,6 +114,8 @@ fi %files %defattr(0644,root,root,0755) %doc KEYS LICENSE.resolver.txt +%{_mavendepmapfragdir}/* +%{_mavenpomdir}/* %{_javadir}/* %attr(0755,root,root) %{_bindir}/* @@ -107,6 +124,9 @@ fi %{_javadocdir}/%{name}-%{version} %changelog +* Sun Sep 19 2010 Mat Booth 0:1.2-3 +- Install a maven pom and depmap. + * Wed Apr 7 2010 Alexander Kurtakov 0:1.2-2 - No need to require jaxp_parser_impl now that we require java 1.5 or newer.