From 852a21ce1b0245353f853842f5f6399bbc299b47 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 14:31:12 +0000 Subject: [PATCH] auto-import changelog data from xalan-j2-2.6.0-1jpp_1rh.src.rpm 2.6.0-1jpp_1rh - Merge with latest community version --- .cvsignore | 2 +- sources | 2 +- xalan-j2-crosslink.patch | 50 ++++---- xalan-j2-manifest.patch | 237 ++++++++++++++++++------------------- xalan-j2-noxsltcdeps.patch | 22 ++-- xalan-j2.spec | 27 +++-- 6 files changed, 170 insertions(+), 170 deletions(-) diff --git a/.cvsignore b/.cvsignore index ad509d7..b5ee441 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xalan-j_2_5_2-src.tar.gz +xalan-j_2_6_0-src.tar.gz diff --git a/sources b/sources index b8fabf1..a973220 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97dcc0514df7f791e28b5c744a55068c xalan-j_2_5_2-src.tar.gz +a210f7108e680ab60a11977ec99ab1f9 xalan-j_2_6_0-src.tar.gz diff --git a/xalan-j2-crosslink.patch b/xalan-j2-crosslink.patch index 09db4aa..05be6a5 100644 --- a/xalan-j2-crosslink.patch +++ b/xalan-j2-crosslink.patch @@ -1,26 +1,26 @@ ---- build.xml~ 2003-10-26 18:39:18.000000000 +0200 -+++ build.xml 2003-11-15 15:47:02.000000000 +0200 +--- 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 @@ - - - -+ - - - -@@ -893,6 +894,7 @@ - - -+ - - - -@@ -944,6 +946,7 @@ - - -+ - - - + + + ++ + + + +@@ -908,6 +909,7 @@ + + ++ + + + +@@ -959,6 +961,7 @@ + + ++ + + + diff --git a/xalan-j2-manifest.patch b/xalan-j2-manifest.patch index a0d6317..bef9fc5 100644 --- a/xalan-j2-manifest.patch +++ b/xalan-j2-manifest.patch @@ -1,121 +1,118 @@ ---- src/MANIFEST.MF~ 2003-10-26 18:38:35.000000000 +0200 -+++ src/MANIFEST.MF 2003-11-15 15:45:09.000000000 +0200 -@@ -1,8 +1,5 @@ - Manifest-Version: 1.0 --Created-By: 1.2.2 (Sun Microsystems Inc.) - Main-Class: org.apache.xalan.xslt.Process --Class-Path: xercesImpl.jar xml-apis.jar -- - - Name: org/apache/xalan - Comment: Main Xalan engine implementing TrAX/JAXP -@@ -27,45 +24,3 @@ - Implementation-Version: @impl.version@ - 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~ 2003-10-26 18:38:40.000000000 +0200 -+++ src/manifest.xsltc 2003-11-15 15:45:46.000000000 +0200 +--- 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: 1.2.2 (Sun Microsystems Inc.) - - Name: org/apache/xalan/xsltc - Comment: Main XSLTC engine implementing TrAX/JAXP -@@ -10,55 +9,3 @@ - Implementation-Version: @impl.version@ - 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 -- + 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 +- diff --git a/xalan-j2-noxsltcdeps.patch b/xalan-j2-noxsltcdeps.patch index 8003faf..e511910 100644 --- a/xalan-j2-noxsltcdeps.patch +++ b/xalan-j2-noxsltcdeps.patch @@ -1,11 +1,11 @@ ---- build.xml.orig 2003-05-30 18:08:41.000000000 +0300 -+++ build.xml 2003-06-07 14:51:44.000000000 +0300 -@@ -533,7 +533,7 @@ - - - -- - - +--- build.xml.orig 2004-02-27 20:45:31.000000000 +0100 ++++ build.xml 2004-03-21 15:46:37.000000000 +0100 +@@ -560,7 +560,7 @@ + + + +- + + diff --git a/xalan-j2.spec b/xalan-j2.spec index 5debdfd..f3ed3fc 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -1,14 +1,14 @@ %define section free +%define version 2.6.0 +%define cvs_version 2_6_0 Name: xalan-j2 -Version: 2.5.2 -Release: 1jpp_2rh +Version: %{version} +Release: 1jpp_1rh Epoch: 0 Summary: Java XSLT processor License: Apache Software License -Source0: http://www.apache.org/dist/xml/xalan-j/source/xalan-j_2_5_2-src.tar.gz -# Taglet jar missing from upstream 2.5.2 source tarball. -Source1: http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-xalan/java/bin/xalan2jtaglet.jar +Source0: http://www.apache.org/dist/xml/xalan-j/source/xalan-j_%{cvs_version}-src.tar.gz Patch0: %{name}-noxsltcdeps.patch Patch1: %{name}-manifest.patch Patch2: %{name}-crosslink.patch @@ -17,6 +17,7 @@ Group: Text Processing/Markup/XML #Vendor: JPackage Project #Distribution: JPackage BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot + BuildArch: noarch Provides: jaxp_transform_impl Requires: jaxp_parser_impl, /usr/sbin/update-alternatives @@ -67,9 +68,8 @@ BuildRequires: servlet %description demo Demonstrations and samples for %{name}. - %prep -%setup -q -n xalan-j_2_5_2 +%setup -q -n xalan-j_%{cvs_version} %patch0 -p0 %patch1 -p0 %patch2 -p0 @@ -78,8 +78,6 @@ find . -name "*.jar" \ ! -name xalan2jdoc.jar \ ! -name stylebook-1.0-b3_xalan-2.jar \ -exec rm -f {} \; -cp -p %{SOURCE1} bin - %build if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi @@ -161,10 +159,9 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \ rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} - %files %defattr(0644,root,root,0755) -%doc KEYS License +%doc KEYS LICENSE %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %ghost %{_javadir}/jaxp_transform_impl.jar @@ -188,11 +185,17 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %defattr(0644,root,root,0755) %{_datadir}/%{name} - %changelog +* Mon Jul 26 2004 Fernando Nasser 0:2.6.0-1jpp_1rh +- Merge with latest community version + * Fri Mar 26 2004 Frank Ch. Eigler 0:2.5.2-1jpp_2rh - add RHUG upgrade cleanup +* Tue Mar 23 2004 Kaj J. Niemi 0:2.6.0-1jpp +- Updated to 2.6.0 +- Patches supplied by + * Thu Mar 4 2004 Frank Ch. Eigler - 0:2.5.2-1jpp_1rh - RH vacuuming