diff --git a/.cvsignore b/.cvsignore index a1cca25..d657436 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1 @@ -adaptx-0.9.6-cvs-RHCLEAN.tar.bz2 -adaptx -noarch -*.src.rpm +adaptx-0.9.13-src-RHCLEAN.tar.gz diff --git a/adaptx-0.9.13-missingstubs.patch b/adaptx-0.9.13-missingstubs.patch new file mode 100644 index 0000000..43218e2 --- /dev/null +++ b/adaptx-0.9.13-missingstubs.patch @@ -0,0 +1,16 @@ +--- ./src/main/org/exolab/adaptx/jaxp/transform/TransformerFactoryImpl.java.sav 2006-07-19 14:06:26.000000000 -0400 ++++ ./src/main/org/exolab/adaptx/jaxp/transform/TransformerFactoryImpl.java 2006-07-19 14:07:13.000000000 -0400 +@@ -193,6 +193,13 @@ + return false; + } //-- getFeature + ++ // DOM Level 3 stub ++ public void setFeature(String name, boolean value) ++ throws TransformerConfigurationException ++ { ++ throw new RuntimeException("not implemented"); ++ } ++ + /** + * Get the object that is used by default during the transformation + * to resolve URIs used in document(), xsl:import, or xsl:include. diff --git a/adaptx-0.9.13-xsl.patch b/adaptx-0.9.13-xsl.patch new file mode 100644 index 0000000..60183dc --- /dev/null +++ b/adaptx-0.9.13-xsl.patch @@ -0,0 +1,45 @@ +--- src/doc/style/exolab.xsl.sav 2006-06-19 18:25:07.000000000 +0200 ++++ src/doc/style/exolab.xsl 2006-06-19 18:28:57.000000000 +0200 +@@ -1,5 +1,5 @@ + +- ++ + + + +--- src/doc/style/keywords.xsl.sav 2006-06-19 18:30:23.000000000 +0200 ++++ src/doc/style/keywords.xsl 2006-06-19 18:30:38.000000000 +0200 +@@ -1,5 +1,5 @@ + +- ++ + + + Keywords +--- src/doc/style/leftNav.xsl.sav 2006-06-19 18:31:37.000000000 +0200 ++++ src/doc/style/leftNav.xsl 2006-06-19 18:31:51.000000000 +0200 +@@ -1,5 +1,5 @@ + +- ++ + + + +--- src/doc/style/topNav.xsl.sav 2006-06-19 18:33:16.000000000 +0200 ++++ src/doc/style/topNav.xsl 2006-06-19 18:33:32.000000000 +0200 +@@ -1,5 +1,5 @@ + +- ++ + + + +--- src/doc/style/searchForm.xsl.sav 2006-06-19 18:32:38.000000000 +0200 ++++ src/doc/style/searchForm.xsl 2006-06-19 18:32:53.000000000 +0200 +@@ -1,5 +1,5 @@ + +- ++ + + + diff --git a/adaptx.spec b/adaptx.spec index ced4662..ff3f938 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -1,32 +1,72 @@ -%define name adaptx -%define version 0.9.6 -%define release 1jpp_4fc +# Copyright (c) 2000-2005, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +%define _with_gcj_support 1 + +%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} + %define section free -Name: %{name} -Version: %{version} -Release: %{release}.1.1 +Name: adaptx +Version: 0.9.13 +Release: 2jpp_1fc Epoch: 0 Summary: AdaptX License: Exolab Software License Group: Development/Libraries/Java -Source0: %{name}-%{version}-cvs-RHCLEAN.tar.bz2 -Url: http://castor.exolab.org/ -Requires: xerces-j2 -BuildRequires: ant -BuildRequires: jpackage-utils >= 0:1.5 -BuildRequires: xerces-j2 +Source0: %{name}-%{version}-src-RHCLEAN.tar.gz +# svn export http://svn.codehaus.org/castor/adaptx + +Patch0: %{name}-%{version}-xsl.patch +Patch1: %{name}-%{version}-missingstubs.patch +Url: http://castor.codehaus.org/ +BuildRequires: ant >= 0:1.6 +BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: xml-commons-apis +%if ! %{gcj_support} BuildArch: noarch +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif + %description Adaptx is an XSLT processor and XPath engine. %package javadoc Group: Development/Java Summary: Javadoc for %{name} -Prereq: coreutils %description javadoc Javadoc for %{name}. @@ -39,19 +79,23 @@ Group: Development/Documentation Documentation for %{name}. %prep -%setup -q -n %{name} +%setup -q -n %{name}-%{version}-src # remove CVS internal files for dir in `find . -type d -name CVS`; do rm -rf $dir; done # remove all binary libs -find . -name "*.jar" -exec rm -f {} \; +for j in $(find . -name "*.jar"); do + mv $j $j.no +done + +%patch0 +%patch1 %build perl -p -i -e 's|classic|modern|' src/build.xml -adaptx_classpath=$(build-classpath xml-commons-apis xerces-j2) -export CLASSPATH=$adaptx_classpath -ant -buildfile src/build.xml jar -ant -buildfile src/build.xml javadoc -export CLASSPATH=dist/adaptx_0.9.6.jar:$adaptx_classpath +#export CLASSPATH=$(build-classpath js log4j xerces-j2 xml-commons-apis) +export CLASSPATH=$(build-classpath xml-commons-apis) +ant -buildfile src/build.xml jar javadoc +CLASSPATH=$CLASSPATH:dist/adaptx_%{version}.jar ant -buildfile src/build.xml doc %install @@ -64,6 +108,10 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} rm -rf build/doc/javadoc +%if %{gcj_support} +%{_bindir}/aot-compile-rpm +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -76,11 +124,31 @@ if [ "$1" = "0" ]; then rm -f %{_javadocdir}/%{name} fi +%post +%if %{gcj_support} +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%postun +%if %{gcj_support} +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + %files %defattr(0664,root,root,0755) %doc src/etc/{CHANGELOG,contributors.html,LICENSE} %{_javadir}/* +%if %{gcj_support} +%attr(-,root,root) %{_libdir}/gcj/%{name}/adaptx-0.9.13.jar.* +%endif + %files javadoc %defattr(0664,root,root,0755) %{_javadocdir}/%{name}-%{version} @@ -90,35 +158,15 @@ fi %doc build/doc/* %changelog -* Wed Jul 12 2006 Jesse Keating - 0:0.9.6-1jpp_4fc.1.1 -- rebuild - -* Mon Mar 6 2006 Jeremy Katz - 0:0.9.6-1jpp_3fc.1 -- stop scriptlet spew - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Tue Nov 22 2005 Vadim Nasardinov - 0:0.9.6-1jpp_2fc -- BZ 162481: - src/main/org/exolab/adaptx/xslt/util/Configuration.java - and - src/main/org/exolab/adaptx/xml/parser/XercesParser.java - both depend on org.apache.xerces.* - This change makes this dependency explicit. - -* Thu Jun 16 2005 Gary Benson 0:0.9.6-1jpp_1fc -- Build into Fedora. - -* Thu Jun 9 2005 Gary Benson -- Remove jarfiles from the tarball. +* Wed Jul 19 2006 Deepak Bhole 0:0.9.13-2jpp_1fc +- Add conditional native compiling. -* Wed Jun 1 2005 Gary Benson -- Remove all jarfiles before building. +* Mon Jun 19 2006 Ralph Apel 0:0.9.13-1jpp +- Upgrade to 0.9.13 -* Fri Mar 5 2004 Frank Ch. Eigler 0:0.9.6-1jpp_1rh -- RH vacuuming -- build with internal adaptx for the moment +* Thu Aug 19 2004 Ralph Apel 0:0.9.6-2jpp +- Build with ant-1.6.2 +- Set xmlns in **/*.xsl * Tue Sep 09 2003 David Walluck 0:0.9.6-1jpp - 0.9.6 diff --git a/sources b/sources index 5b316ca..10fc213 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b85e4869fd4c3a3d1a8d1ef81fc25f7 adaptx-0.9.6-cvs-RHCLEAN.tar.bz2 +5d9765b42d49bb83b7b8ac00a57cabc9 adaptx-0.9.13-src-RHCLEAN.tar.gz