rpms/xalan-j2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix review comments.

Browse Source
This commit is contained in:
Alexander Kurtakov 2011-07-26 17:43:28 +03:00
parent 913620fabf
commit 832fd388b7
4 changed files with 25 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xalan-j2-crosslink.patch
View File

@ -1,26 +0,0 @@
--- build.xml.orig 2004-03-21 15:59:26.000000000 +0100
+++ build.xml 2004-03-21 16:02:02.000000000 +0100
@@ -154,6 +154,7 @@
<property name="xdocs.DONE.file" value="${xdocs.dir}/sources/xalan/DONE"/>
<property name="xdocs.XSLTCDONE.file" value="XSLTCDONE"/>
<property name="xdocs.XSLTCDONE.location" value="${xdocs.dir}/sources/xalan/${xdocs.XSLTCDONE.file}"/>
+ <property name="api.j2se" value="http://java.sun.com/j2se/1.4/docs/api/"/>
<path id="docs.class.path">
<pathelement location="${xmlapis.jar}" />
<pathelement location="${parser.jar}" />
@@ -908,6 +909,7 @@
<group title="DOM 2" packages="org.w3c.dom*"/>
<group title="XSLTC Core"
packages="org.apache.xalan.xsltc*"/>
+ <link href="${api.j2se}"/>
</javadoc>
<!-- remove the xml-commons sources -->
@@ -959,6 +961,7 @@
<group title="DOM 2" packages="org.w3c.dom*"/>
<group title="XSLTC Core"
packages="org.apache.xalan.xsltc*"/>
+ <link href="${api.j2se}"/>
</javadoc>
<!-- remove the xml-commons sources -->

118
xalan-j2-manifest.patch
View File

@ -1,118 +0,0 @@
--- src/MANIFEST.MF.orig 2004-03-21 15:54:40.000000000 +0100
+++ src/MANIFEST.MF 2004-03-21 15:54:25.000000000 +0100
@@ -1,7 +1,5 @@
Manifest-Version: 1.0
-Created-By: @java.version@ (@java.vendor@)
Main-Class: org.apache.xalan.xslt.Process
-Class-Path: xercesImpl.jar xml-apis.jar
Name: org/apache/xalan
@@ -28,44 +26,3 @@
Implementation-Vendor: Apache Software Foundation
Implementation-URL: http://xml.apache.org/xalan-j/dist/
-Name: org/apache/xalan/xsltc
-Comment: Main XSLTC engine implementing TrAX/JAXP
-Specification-Title: Java API for XML Processing
-Specification-Vendor: Sun Microsystems Inc.
-Specification-Version: 1.2
-Implementation-Title: org.apache.xalan.xsltc
-Implementation-Version: @impl.version@
-Implementation-Vendor: Apache Software Foundation
-Implementation-URL: http://xml.apache.org/xalan-j/dist/
-
-Name: runtime
-Comment: Runtime component of JCup
-Specification-Title: Runtime component of JCup
-Specification-Vendor: Princeton University
-Specification-Version: 0.10k
-Implementation-Title: runtime
-Implementation-Version: @impl.version@
-Implementation-Vendor: Princeton University
-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/
-
-Name: org/apache/bcel
-Comment: Byte Code Engineering Library
-Specification-Title: Byte Code Engineering Library
-Specification-Vendor: Markus Dahm
-Specification-Version: 5.0 rc1
-Implementation-Title: org.apache.bcel
-Implementation-Version: @impl.version@
-Implementation-Vendor: Apache Software Foundation
-Implementation-URL: http://jakarta.apache.org/bcel
-
-Name: org/apache/regexp
-Comment: Java Regular Expression package
-Specification-Title: Java Regular Expression package
-Specification-Vendor: Apache Software Foundation
-Specification-Version: 1.2
-Implementation-Title: org.apache.regexp
-Implementation-Version: @impl.version@
-Implementation-Vendor: Apache Software Foundation
-Implementation-URL: http://jakarta.apache.org/regexp
-
-
--- src/manifest.xsltc.orig 2004-03-21 15:54:59.000000000 +0100
+++ src/manifest.xsltc 2004-03-21 15:54:25.000000000 +0100
@@ -1,5 +1,4 @@
Manifest-Version: 1.0
-Created-By: @java.version@ (@java.vendor@)
Name: org/apache/xalan/xsltc
Comment: Main XSLTC engine implementing TrAX/JAXP
@@ -11,54 +10,3 @@
Implementation-Vendor: Apache Software Foundation
Implementation-URL: http://xml.apache.org/xalan-j/dist/
-Name: JLex
-Comment: A Lexical Analyzer for Java
-Specification-Title: A Lexical Analyzer for Java
-Specification-Vendor: Princeton University
-Specification-Version: 1.2.5
-Implementation-Title: JLex
-Implementation-Version: @impl.version@
-Implementation-Vendor: Princeton University
-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/JLex/
-
-Name: java_cup
-Comment: Parser Generator for Java
-Specification-Title: Parser Generator for Java
-Specification-Vendor: Princeton University
-Specification-Version: 0.10k
-Implementation-Title: java_cup
-Implementation-Version: @impl.version@
-Implementation-Vendor: Princeton University
-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/
-
-Name: runtime
-Comment: Runtime component of JCup
-Specification-Title: Runtime component of JCup
-Specification-Vendor: Princeton University
-Specification-Version: 0.10k
-Implementation-Title: runtime
-Implementation-Version: @impl.version@
-Implementation-Vendor: Princeton University
-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/
-
-
-Name: org/apache/bcel
-Comment: Byte Code Engineering Library
-Specification-Title: Byte Code Engineering Library
-Specification-Vendor: Markus Dahm
-Specification-Version: 5.0 rc1
-Implementation-Title: org.apache.bcel
-Implementation-Version: @impl.version@
-Implementation-Vendor: Apache Software Foundation
-Implementation-URL: http://jakarta.apache.org/bcel
-
-Name: org/apache/regexp
-Comment: Java Regular Expression package
-Specification-Title: Java Regular Expression package
-Specification-Vendor: Apache Software Foundation
-Specification-Version: 1.2
-Implementation-Title: org.apache.regexp
-Implementation-Version: @impl.version@
-Implementation-Vendor: Apache Software Foundation
-Implementation-URL: http://jakarta.apache.org/regexp
-

32
xalan-j2-src-MANIFEST-MF.patch
View File

@ -1,32 +0,0 @@
--- ./src/manifest.xalan-interpretive.sav 2006-07-26 13:03:51.000000000 -0400
+++ ./src/manifest.xalan-interpretive 2006-07-26 13:04:05.000000000 -0400
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Created-By: @java.version@ (@java.vendor@)
Main-Class: org.apache.xalan.xslt.Process
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
+Class-Path: xercesImpl.jar xml-apis.jar xalan-j2-serializer.jar
Name: org/apache/xalan/
Comment: Main Xalan engine implementing TrAX/JAXP
--- ./src/manifest.xsltc.sav 2006-07-26 13:04:32.000000000 -0400
+++ ./src/manifest.xsltc 2006-07-26 13:04:49.000000000 -0400
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Created-By: @java.version@ (@java.vendor@)
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
+Class-Path: xercesImpl.jar xml-apis.jar xalan-j2-serializer.jar
Name: org/apache/xalan/xsltc/
Comment: Main XSLTC engine implementing TrAX/JAXP
--- ./src/MANIFEST.MF.sav 2006-07-26 13:05:16.000000000 -0400
+++ ./src/MANIFEST.MF 2006-07-26 13:05:28.000000000 -0400
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Created-By: @java.version@ (@java.vendor@)
Main-Class: org.apache.xalan.xslt.Process
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
+Class-Path: xercesImpl.jar xml-apis.jar xalan-j2-serializer.jar
Name: org/apache/xalan/

60
xalan-j2.spec
View File

@ -32,7 +32,7 @@
Name: xalan-j2
Version: 2.7.1
Release: 4%{?dist}
Release: 5%{?dist}
Epoch: 0
Summary: Java XSLT processor
# samples/servlet/ApplyXSLTException.java is ASL 1.1
@ -41,12 +41,8 @@ License: ASL 1.1 and ASL 2.0 and W3C
Source0: http://www.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz
Source1: %{name}-serializer-MANIFEST.MF
Patch0: %{name}-noxsltcdeps.patch
Patch1: %{name}-manifest.patch
Patch2: %{name}-crosslink.patch
#This patch uses xalan-j2-serializer.jar in the MANIFEST files instead of serializer
Patch3: %{name}-src-MANIFEST-MF.patch
URL: http://xalan.apache.org/
Group: Text Processing/Markup/XML
Group: Development/Libraries
BuildArch: noarch
Provides: jaxp_transform_impl
@ -54,14 +50,14 @@ Requires: xerces-j2
Requires(post): chkconfig
Requires(preun): chkconfig
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: java-devel
BuildRequires: java-devel
BuildRequires: ant
BuildRequires: bcel
BuildRequires: jlex
BuildRequires: java_cup
BuildRequires: regexp
BuildRequires: sed
BuildRequires: servlet25
BuildRequires: jlex
BuildRequires: java_cup
BuildRequires: regexp
BuildRequires: sed
BuildRequires: servlet25
BuildRequires: xerces-j2 >= 0:2.7.1
BuildRequires: xml-commons-apis >= 0:1.3
BuildRequires: xml-stylebook
@ -76,12 +72,12 @@ in other program.
%package xsltc
Summary: XSLT compiler
Group: Text Processing/Markup/XML
Group: Development/Tools
Requires: java_cup
Requires: bcel
Requires: jlex
Requires: regexp
Requires: xerces-j2
Requires: bcel
Requires: jlex
Requires: regexp
Requires: xerces-j2
%description xsltc
The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets into
@ -89,14 +85,14 @@ lightweight and portable Java byte codes called translets.
%package manual
Summary: Manual for %{name}
Group: Text Processing/Markup/XML
Group: Documentation
%description manual
Documentation for %{name}.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Group: Documentation
Requires: jpackage-utils
BuildRequires: java-javadoc
@ -105,7 +101,7 @@ Javadoc for %{name}.
%package demo
Summary: Demo for %{name}
Group: Text Processing/Markup/XML
Group: Documentation
Requires: %{name} = %{epoch}:%{version}-%{release}, servlet25
%description demo
@ -114,12 +110,9 @@ Demonstrations and samples for %{name}.
%prep
%setup -q -n xalan-j_%{cvs_version}
%patch0 -p0
#%patch3 -p0
#%patch1 -p0
#%patch2 -p0
# Remove all binary libs, except ones needed to build docs and N/A elsewhere.
for j in $(find . -name "*.jar"); do
mv $j $j.no
mv $j $j.no
done
# FIXME who knows where the sources are? xalan-j1 ?
mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar
@ -201,16 +194,6 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
} >/dev/null 2>&1 || :
#%post xsltc
#update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
# jaxp_transform_impl %{_javadir}/xsltc.jar 10
#%preun xsltc
#{
# [ $1 = 0 ] || exit 0
# update-alternatives --remove jaxp_transform_impl %{_javadir}/xsltc.jar
#} >/dev/null 2>&1 || :
%files
%doc KEYS LICENSE.txt NOTICE.txt readme.html
%{_javadir}/%{name}.jar
@ -218,18 +201,25 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
%ghost %{_javadir}/jaxp_transform_impl.jar
%files xsltc
%doc LICENSE.txt
%{_javadir}/xsltc.jar
%files manual
%doc LICENSE.txt
%doc build/docs/*
%files javadoc
%doc LICENSE.txt
%doc %{_javadocdir}/%{name}
%files demo
%{_datadir}/%{name}
%changelog
* Tue Jul 26 2011 Alexander Kurtakov <akurtako@redhat.com> 0:2.7.1-5
- Remove old commented parts.
- Fix rpmlint warnings.
* Tue Jun 28 2011 Alexander Kurtakov <akurtako@redhat.com> 0:2.7.1-4
- Fix FTBFS.
@ -496,7 +486,7 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
* Fri Sep 14 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.2.D10-1mdk
- cvs references
- splitted demo package
- moved demo files to %{_datadir}/%{name}
- moved demo files to %%{_datadir}/%%{name}
- only manual package requires stylebook-1.0b3
- only demo package requires servletapi3