Fix broken links in manual and fix javadoc requires. Build 1.5 bytecode
instead of 1.6, for compatibility.
This commit is contained in:
mbooth
parent
b99b12167b
commit
3db4d50600
@ -1,5 +1,5 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.2
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||
Bundle-SymbolicName: org.apache.xerces
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Apache Xerces-J
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- build.xml 2006-11-22 23:37:02.000000000 +0000
|
||||
+++ build.xml 2010-01-05 12:54:48.867006272 +0000
|
||||
--- build.xml.orig 2006-11-22 23:37:02.000000000 +0000
|
||||
+++ build.xml 2010-06-13 12:36:20.318588565 +0100
|
||||
@@ -101,7 +101,6 @@
|
||||
<property name="distsrc.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
|
||||
<property name="disttools.dir" value="${build.dir}/tools"/>
|
||||
@ -37,6 +37,24 @@
|
||||
<!-- substitute tokens as needed -->
|
||||
<replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
|
||||
token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
|
||||
@@ -251,7 +228,7 @@
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
- <xjavac srcdir="${build.src}"
|
||||
+ <xjavac target="1.5" source="1.5" srcdir="${build.src}"
|
||||
destdir="${build.dest}"
|
||||
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
|
||||
debug="${debug}"
|
||||
@@ -314,7 +291,7 @@
|
||||
<copy todir="${build.samples}" >
|
||||
<fileset dir="${samples.dir}"/>
|
||||
</copy>
|
||||
- <xjavac srcdir="${build.samples}"
|
||||
+ <xjavac target="1.5" source="1.5" srcdir="${build.samples}"
|
||||
destdir="${build.dest}"
|
||||
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
|
||||
debug="${debug}"
|
||||
@@ -1181,28 +1158,6 @@
|
||||
<replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"
|
||||
token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: xerces-j2
|
||||
Version: 2.9.0
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Java XML parser
|
||||
Group: Development/Libraries
|
||||
License: ASL 2.0
|
||||
@ -34,7 +34,7 @@ BuildRequires: xalan-j2
|
||||
BuildRequires: xml-stylebook
|
||||
BuildRequires: jaxp_parser_impl
|
||||
BuildRequires: dejavu-sans-fonts
|
||||
Requires: java >= 1:1.6.0
|
||||
Requires: java
|
||||
Requires: jpackage-utils
|
||||
Requires: xml-commons-apis >= 1.3
|
||||
Requires: xml-commons-resolver >= 1.1
|
||||
@ -43,6 +43,9 @@ Provides: jaxp_parser_impl = 1.3
|
||||
Requires(post): chkconfig jaxp_parser_impl
|
||||
Requires(preun): chkconfig jaxp_parser_impl
|
||||
|
||||
# This documentation is provided by xml-commons-apis
|
||||
Obsoletes: %{name}-javadoc-apis < %{version}-%{release}
|
||||
|
||||
%description
|
||||
Welcome to the future! Xerces2 is the next generation of high performance,
|
||||
fully compliant XML parsers in the Apache Xerces family. This new version of
|
||||
@ -73,50 +76,50 @@ APIs are in use.
|
||||
%package javadoc-impl
|
||||
Summary: Javadoc for %{name} implementation
|
||||
Group: Documentation
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description javadoc-impl
|
||||
Javadoc for %{name} implementation.
|
||||
%{summary}.
|
||||
|
||||
%package javadoc-apis
|
||||
Summary: Javadoc for %{name} apis
|
||||
%package javadoc-xs
|
||||
Summary: Javadoc for %{name} XML schema API
|
||||
Group: Documentation
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description javadoc-apis
|
||||
Javadoc for %{name} apis.
|
||||
%description javadoc-xs
|
||||
%{summary}.
|
||||
|
||||
%package javadoc-xni
|
||||
Summary: Javadoc for %{name} XNI
|
||||
Group: Documentation
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description javadoc-xni
|
||||
Javadoc for %{name} XNI.
|
||||
%{summary}.
|
||||
|
||||
%package javadoc-other
|
||||
Summary: Javadoc for other %{name} components
|
||||
Group: Documentation
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description javadoc-other
|
||||
Javadoc for other %{name} components.
|
||||
%{summary}.
|
||||
|
||||
%package manual
|
||||
Summary: Manual for %{name}
|
||||
Group: Documentation
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: xml-commons-apis-javadoc
|
||||
Requires: %{name}-javadoc-impl = %{version}-%{release}
|
||||
Requires: %{name}-javadoc-xs = %{version}-%{release}
|
||||
Requires: %{name}-javadoc-xni = %{version}-%{release}
|
||||
Requires: %{name}-javadoc-other = %{version}-%{release}
|
||||
|
||||
%description manual
|
||||
Manual for %{name}.
|
||||
%{summary}.
|
||||
|
||||
%package demo
|
||||
Summary: Demo for %{name}
|
||||
Summary: Demonstrations and samples for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description demo
|
||||
Demonstrations and samples for %{name}.
|
||||
%{summary}.
|
||||
|
||||
%package scripts
|
||||
Summary: Additional utility scripts for %{name}
|
||||
@ -124,11 +127,11 @@ Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description scripts
|
||||
Additional utility scripts for %{name}.
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
%setup -q -n xerces-%{cvs_version}
|
||||
%patch0
|
||||
%patch0 -p0 -b .orig
|
||||
|
||||
# Copy the custom ant tasks into place
|
||||
mkdir -p tools/org/apache/xerces/util
|
||||
@ -186,9 +189,9 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name}-impl-%{version}
|
||||
cp -pr build/docs/javadocs/xerces2/* %{buildroot}%{_javadocdir}/%{name}-impl-%{version}
|
||||
(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-impl-%{version} %{name}-impl)
|
||||
|
||||
mkdir -p %{buildroot}%{_javadocdir}/%{name}-apis-%{version}
|
||||
cp -pr build/docs/javadocs/api/* %{buildroot}%{_javadocdir}/%{name}-apis-%{version}
|
||||
(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-apis-%{version} %{name}-apis)
|
||||
mkdir -p %{buildroot}%{_javadocdir}/%{name}-xs-%{version}
|
||||
cp -pr build/docs/javadocs/api/* %{buildroot}%{_javadocdir}/%{name}-xs-%{version}
|
||||
(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-xs-%{version} %{name}-xs)
|
||||
|
||||
mkdir -p %{buildroot}%{_javadocdir}/%{name}-xni-%{version}
|
||||
cp -pr build/docs/javadocs/xni/* %{buildroot}%{_javadocdir}/%{name}-xni-%{version}
|
||||
@ -198,20 +201,23 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name}-other-%{version}
|
||||
cp -pr build/docs/javadocs/other/* %{buildroot}%{_javadocdir}/%{name}-other-%{version}
|
||||
(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-other-%{version} %{name}-other)
|
||||
|
||||
rm -rf build/docs/javadocs
|
||||
rm -rf build/docs/javadocs/*
|
||||
|
||||
# manual
|
||||
mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}/manual
|
||||
install -d %{buildroot}%{_docdir}/%{name}-%{version}/manual
|
||||
cp -pr build/docs/* %{buildroot}%{_docdir}/%{name}-%{version}/manual
|
||||
ln -s ../../../../javadoc/xml-commons-apis/ %{buildroot}%{_docdir}/%{name}-%{version}/manual/javadocs/api
|
||||
ln -s ../../../../javadoc/%{name}-impl/ %{buildroot}%{_docdir}/%{name}-%{version}/manual/javadocs/xerces2
|
||||
ln -s ../../../../javadoc/%{name}-xs/ %{buildroot}%{_docdir}/%{name}-%{version}/manual/javadocs/xs
|
||||
ln -s ../../../../javadoc/%{name}-xni/ %{buildroot}%{_docdir}/%{name}-%{version}/manual/javadocs/xni
|
||||
ln -s ../../../../javadoc/%{name}-other/ %{buildroot}%{_docdir}/%{name}-%{version}/manual/javadocs/other
|
||||
|
||||
# other docs
|
||||
cp -p LICENSE README NOTICE %{buildroot}%{_docdir}/%{name}-%{version}
|
||||
install -p LICENSE README NOTICE %{buildroot}%{_docdir}/%{name}-%{version}
|
||||
|
||||
# scripts
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
cp -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}-version
|
||||
cp -p %{SOURCE2} %{buildroot}%{_bindir}/%{name}-constants
|
||||
chmod 755 %{buildroot}%{_bindir}/*
|
||||
install -pD -m755 -T %{SOURCE1} %{buildroot}%{_bindir}/%{name}-version
|
||||
install -pD -m755 -T %{SOURCE2} %{buildroot}%{_bindir}/%{name}-constants
|
||||
|
||||
# demo
|
||||
install -pD -T build/xercesSamples.jar %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar
|
||||
@ -248,10 +254,10 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
|
||||
%{_javadocdir}/%{name}-impl-%{version}
|
||||
%{_javadocdir}/%{name}-impl
|
||||
|
||||
%files javadoc-apis
|
||||
%files javadoc-xs
|
||||
%defattr(-,root,root,-)
|
||||
%{_javadocdir}/%{name}-apis-%{version}
|
||||
%{_javadocdir}/%{name}-apis
|
||||
%{_javadocdir}/%{name}-xs-%{version}
|
||||
%{_javadocdir}/%{name}-xs
|
||||
|
||||
%files javadoc-other
|
||||
%defattr(-,root,root,-)
|
||||
@ -277,6 +283,10 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
|
||||
%{_bindir}/*
|
||||
|
||||
%changelog
|
||||
* Sat Jun 12 2010 Mat Booth <fedora@matbooth.co.uk> - 2.9.0-4
|
||||
- Fix broken links in manual and fix javadoc requires.
|
||||
- Build 1.5 bytecode instead of 1.6, for compatibility.
|
||||
|
||||
* Fri Jan 22 2010 Andrew Overholt <overholt@redhat.com> - 2.9.0-3
|
||||
- Fix unversioned Provides for jaxp_parser_impl (make it 1.3).
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user