From 4b4ea7423d244052d11a8aa8aedc03b15cb394457a81782b33d7c6a60bda3c70 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 22 Sep 2024 07:00:32 +0000 Subject: [PATCH 1/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=47 --- .gitattributes | 23 +++ .gitignore | 1 + openjdk-build.patch | 288 ++++++++++++++++++++++++++++++++ serializer-2.7.3.pom | 8 + xalan-2.7.3.pom | 8 + xalan-j2-MANIFEST.MF | 72 ++++++++ xalan-j2-crosslink.patch | 30 ++++ xalan-j2-manifest.patch | 111 ++++++++++++ xalan-j2-noxsltcdeps.patch | 12 ++ xalan-j2-serializer-MANIFEST.MF | 10 ++ xalan-j2.changes | 204 ++++++++++++++++++++++ xalan-j2.spec | 228 +++++++++++++++++++++++++ xalan-j_2_7_3-src.tar.gz | 3 + xsltc-2.7.3.pom | 13 ++ 14 files changed, 1011 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 openjdk-build.patch create mode 100644 serializer-2.7.3.pom create mode 100644 xalan-2.7.3.pom create mode 100644 xalan-j2-MANIFEST.MF create mode 100644 xalan-j2-crosslink.patch create mode 100644 xalan-j2-manifest.patch create mode 100644 xalan-j2-noxsltcdeps.patch create mode 100644 xalan-j2-serializer-MANIFEST.MF create mode 100644 xalan-j2.changes create mode 100644 xalan-j2.spec create mode 100644 xalan-j_2_7_3-src.tar.gz create mode 100644 xsltc-2.7.3.pom diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/openjdk-build.patch b/openjdk-build.patch new file mode 100644 index 0000000..d8ec465 --- /dev/null +++ b/openjdk-build.patch @@ -0,0 +1,288 @@ +diff -urEbwB xalan-j_2_7_3.orig/build.xml xalan-j_2_7_3/build.xml +--- xalan-j_2_7_3.orig/build.xml 2023-08-30 18:36:44.177771503 +0200 ++++ xalan-j_2_7_3/build.xml 2023-08-30 18:49:32.266249508 +0200 +@@ -221,14 +221,12 @@ + + + +- + + + + + + +- + + + +@@ -237,7 +235,6 @@ + + + +- + + + +@@ -398,7 +395,6 @@ + + +- + + + +@@ -414,6 +410,12 @@ + + ++ ++ ++ ++ ++ + + + + +- + + + +@@ -454,7 +455,6 @@ + + +- + + + +@@ -469,7 +469,6 @@ + target="${compiler.target}" source="${compiler.source}" + nowarn="${compiler.nowarn}"> + +- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@@ -889,7 +886,6 @@ + + +@@ -930,14 +926,14 @@ + + + + + +@@ -951,7 +947,7 @@ + + + + + +@@ -989,7 +985,7 @@ + + + +@@ -1008,7 +1004,7 @@ + + +@@ -1627,7 +1623,7 @@ + + ++ classpath="${build.xalan.jar}:${bin.dir}/fop.jar:${bin.dir}/w3c.jar"> + + + +@@ -1764,7 +1760,6 @@ + nowarn="${compiler.nowarn}"> + + +- + + + +Only in xalan-j_2_7_3: build.xml.orig +Only in xalan-j_2_7_3: build.xml.rej diff --git a/serializer-2.7.3.pom b/serializer-2.7.3.pom new file mode 100644 index 0000000..8d0a00b --- /dev/null +++ b/serializer-2.7.3.pom @@ -0,0 +1,8 @@ + + + 4.0.0 + xalan + serializer + 2.7.3 + diff --git a/xalan-2.7.3.pom b/xalan-2.7.3.pom new file mode 100644 index 0000000..5a2cbc1 --- /dev/null +++ b/xalan-2.7.3.pom @@ -0,0 +1,8 @@ + + + 4.0.0 + xalan + xalan + 2.7.3 + diff --git a/xalan-j2-MANIFEST.MF b/xalan-j2-MANIFEST.MF new file mode 100644 index 0000000..063c112 --- /dev/null +++ b/xalan-j2-MANIFEST.MF @@ -0,0 +1,72 @@ +Main-Class: org.apache.xalan.xslt.Process +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.apache.xalan +Bundle-Version: 2.7.3 +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.apache.regexp;version="2.7.3", + org.apache.xalan;version="2.7.3", + org.apache.xalan.client;version="2.7.3", + org.apache.xalan.extensions;version="2.7.3", + org.apache.xalan.lib;version="2.7.3", + org.apache.xalan.lib.sql;version="2.7.3", + org.apache.xalan.processor;version="2.7.3", + org.apache.xalan.res;version="2.7.3", + org.apache.xalan.serialize;version="2.7.3", + org.apache.xalan.templates;version="2.7.3", + org.apache.xalan.trace;version="2.7.3", + org.apache.xalan.transformer;version="2.7.3", + org.apache.xalan.xslt;version="2.7.3", + org.apache.xalan.xsltc;version="2.7.3", + org.apache.xalan.xsltc.cmdline;version="2.7.3", + org.apache.xalan.xsltc.cmdline.getopt;version="2.7.3", + org.apache.xalan.xsltc.compiler;version="2.7.3", + org.apache.xalan.xsltc.compiler.util;version="2.7.3", + org.apache.xalan.xsltc.dom;version="2.7.3", + org.apache.xalan.xsltc.runtime;version="2.7.3", + org.apache.xalan.xsltc.runtime.output;version="2.7.3", + org.apache.xalan.xsltc.trax;version="2.7.3", + org.apache.xalan.xsltc.util;version="2.7.3", + org.apache.xml.dtm;version="2.7.3", + org.apache.xml.dtm.ref;version="2.7.3", + org.apache.xml.dtm.ref.dom2dtm;version="2.7.3", + org.apache.xml.dtm.ref.sax2dtm;version="2.7.3", + org.apache.xml.res;version="2.7.3", + org.apache.xml.utils;version="2.7.3", + org.apache.xml.utils.res;version="2.7.3", + org.apache.xpath;version="2.7.3", + org.apache.xpath.axes;version="2.7.3", + org.apache.xpath.compiler;version="2.7.3", + org.apache.xpath.domapi;version="2.7.3", + org.apache.xpath.functions;version="2.7.3", + org.apache.xpath.jaxp;version="2.7.3", + org.apache.xpath.objects;version="2.7.3", + org.apache.xpath.operations;version="2.7.3", + org.apache.xpath.patterns;version="2.7.3", + org.apache.xpath.res;version="2.7.3" +Require-Bundle: system.bundle, org.apache.xerces +Eclipse-BuddyPolicy: registered + +Name: org/apache/xalan/ +Comment: Main Xalan engine implementing TrAX/JAXP +Specification-Title: Java API for XML Processing +Specification-Vendor: Sun Microsystems Inc. +Specification-Version: 1.3 +Implementation-Title: org.apache.xalan +Implementation-Version: 2.7.3 +Implementation-Vendor: Apache Software Foundation +Implementation-URL: http://xml.apache.org/xalan-j/dist/ + +Name: org/apache/xml/ +Comment: DTM implementation and utilities +Implementation-Title: org.apache.xml +Implementation-Version: 2.7.3 +Implementation-Vendor: Apache Software Foundation +Implementation-URL: http://xml.apache.org/xalan-j/dist/ + +Name: org/apache/xpath/ +Comment: XPath engine +Implementation-Title: org.apache.xpath +Implementation-Version: 2.7.3 +Implementation-Vendor: Apache Software Foundation +Implementation-URL: http://xml.apache.org/xalan-j/dist/ diff --git a/xalan-j2-crosslink.patch b/xalan-j2-crosslink.patch new file mode 100644 index 0000000..53f2407 --- /dev/null +++ b/xalan-j2-crosslink.patch @@ -0,0 +1,30 @@ +diff -urN xalan-j_2_7_2.old/build.xml xalan-j_2_7_2/build.xml +--- xalan-j_2_7_2.old/build.xml 2014-06-23 09:21:30.815410307 +0200 ++++ xalan-j_2_7_2/build.xml 2014-06-23 09:22:59.124418473 +0200 +@@ -204,7 +204,9 @@ + + + +- ++ ++ ++ + + + +@@ -1098,6 +1100,7 @@ + + ++ + + + +@@ -1133,6 +1136,7 @@ + + ++ + + + diff --git a/xalan-j2-manifest.patch b/xalan-j2-manifest.patch new file mode 100644 index 0000000..fe55e2c --- /dev/null +++ b/xalan-j2-manifest.patch @@ -0,0 +1,111 @@ +diff -urEbwB xalan-j_2_7_3.orig/src/MANIFEST.MF xalan-j_2_7_3/src/MANIFEST.MF +--- xalan-j_2_7_3.orig/src/MANIFEST.MF 2023-08-30 18:36:44.211105060 +0200 ++++ xalan-j_2_7_3/src/MANIFEST.MF 2023-08-30 18:39:12.542098631 +0200 +@@ -1,7 +1,6 @@ + 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 + + + Name: org/apache/xalan/ +@@ -38,33 +37,3 @@ + Implementation-Vendor: Apache Software Foundation + Implementation-URL: https://xalan.apache.org/xalan-j/ + +-Name: java_cup/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: Apache Commons Byte Code Engineering Library +-Specification-Title: Apache Commons BCEL +-Specification-Vendor: Apache Software Foundation +-Specification-Version: 6.7.0 +-Implementation-Title: org.apache.bcel +-Implementation-Version: @impl.version@ +-Implementation-Vendor: Apache Software Foundation +-Implementation-URL: https://commons.apache.org/proper/commons-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 -urEbwB xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER xalan-j_2_7_3/src/MANIFEST.SERIALIZER +--- xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER 2023-08-30 18:36:44.211105060 +0200 ++++ xalan-j_2_7_3/src/MANIFEST.SERIALIZER 2023-08-30 18:38:46.375256700 +0200 +@@ -1,7 +1,6 @@ + Manifest-Version: 1.0 + Created-By: @java.version@ (@java.vendor@) + Main-Class: org.apache.xml.serializer.Version +-Class-Path: xml-apis.jar + + Name: org/apache/xml/serializer/ + Comment: Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input SAX events. +diff -urEbwB xalan-j_2_7_3.orig/src/manifest.xalan-interpretive xalan-j_2_7_3/src/manifest.xalan-interpretive +--- xalan-j_2_7_3.orig/src/manifest.xalan-interpretive 2023-08-30 18:36:44.211105060 +0200 ++++ xalan-j_2_7_3/src/manifest.xalan-interpretive 2023-08-30 18:38:46.375256700 +0200 +@@ -1,7 +1,6 @@ + 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 + + Name: org/apache/xalan/ + Comment: Main Xalan engine implementing TrAX/JAXP +diff -urEbwB xalan-j_2_7_3.orig/src/manifest.xsltc xalan-j_2_7_3/src/manifest.xsltc +--- xalan-j_2_7_3.orig/src/manifest.xsltc 2023-08-30 18:36:44.211105060 +0200 ++++ xalan-j_2_7_3/src/manifest.xsltc 2023-08-30 18:39:52.469032707 +0200 +@@ -1,6 +1,5 @@ + Manifest-Version: 1.0 + Created-By: @java.version@ (@java.vendor@) +-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar + + Name: org/apache/xalan/xsltc/ + Comment: Main XSLTC engine implementing TrAX/JAXP +@@ -19,33 +18,3 @@ + Implementation-Vendor: Apache Software Foundation + Implementation-URL: http://xml.apache.org/xalan-j/dist/ + +-Name: java_cup/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: 6.6.0 +-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 new file mode 100644 index 0000000..b2cc2dc --- /dev/null +++ b/xalan-j2-noxsltcdeps.patch @@ -0,0 +1,12 @@ +diff -urN xalan-j_2_7_2.old/build.xml xalan-j_2_7_2/build.xml +--- xalan-j_2_7_2.old/build.xml 2014-06-23 09:21:30.815410307 +0200 ++++ xalan-j_2_7_2/build.xml 2014-06-23 09:25:00.547429701 +0200 +@@ -616,7 +616,7 @@ + + + +- + + diff --git a/xalan-j2-serializer-MANIFEST.MF b/xalan-j2-serializer-MANIFEST.MF new file mode 100644 index 0000000..7794602 --- /dev/null +++ b/xalan-j2-serializer-MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-RequiredExecutionEnvironment: J2SE-1.2 +Bundle-SymbolicName: org.apache.xml.serializer +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-Localization: plugin +Bundle-Version: 2.7.3 +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.apache.xml.serializer,org.apache.xml.serializer.do + m3 diff --git a/xalan-j2.changes b/xalan-j2.changes new file mode 100644 index 0000000..d5e9362 --- /dev/null +++ b/xalan-j2.changes @@ -0,0 +1,204 @@ +------------------------------------------------------------------- +Sun Sep 22 07:00:22 UTC 2024 - Fridrich Strba + +- Use SOURCE_DATE_EPOCH for reproducible builds + +------------------------------------------------------------------- +Wed Feb 21 16:24:59 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + +------------------------------------------------------------------- +Thu Aug 31 08:42:41 UTC 2023 - Fridrich Strba + +- Update to upstream version 2.7.3 + * Java 8 requirement + + This XalanJ release, requires users to use Java minimum + version 8 for working with XalanJ. + * Fix for CVE-2022-34169 (bsc#1201684) An integer truncation issue + when processing malicious XSLT stylesheets + + This issue was fixed within XalanJ's XSLTC processor. This + XalanJ issue, when present causes following problems: + Malicious XSLT stylesheets may be written, which could result + in XalanJ invalid translet Java byte code to be produced by + XalanJ XSLTC processor. The XalanJ translet is a Java byte + code compiled representation, of an XSLT transformation. + * Upgrade to Apache Commons BCEL 6.7.0 + + This XalanJ release, contains upgraded version of Apache + Commons BCEL library. + * Enhancements for, performing XalanJ build and running of XalanJ + tests from source distribution + + The XalanJ users, can now make XalanJ builds and perform + XalanJ tests from the XalanJ source distribution. The XalanJ + build scripts for the implementation and the tests, both for + the Windows and Linux platforms, were enhanced to support + building XalanJ with JDK 1.8. + * Upgrade to Xerces-J 2.12.2 + + This XalanJ release, contains upgraded versions of + xercesImpl.jar and xml-apis.jar (Xerces-J 2.12.2). +- Modified patches: + * openjdk-build.patch + * xalan-j2-manifest.patch + + rediff to changed context + +------------------------------------------------------------------- +Fri Mar 18 16:35:47 UTC 2022 - Fridrich Strba + +- Build with source/target levels 8 + +------------------------------------------------------------------- +Wed Mar 9 10:03:49 UTC 2022 - Fridrich Strba + +- Do not link to the java_cup* compatibility links, but to the + java-cup* ones + +------------------------------------------------------------------- +Tue Jul 6 07:31:04 UTC 2021 - Fridrich Strba + +- Remove parent from the pom files, since we are not building + with maven +- Clean-up packaging + +------------------------------------------------------------------- +Fri Feb 1 10:23:16 UTC 2019 - Fridrich Strba + +- Add xalan-j2-serializer-MANIFEST.MF and xalan-j2-MANIFEST.MF + * Contain OSGi metadata required by Eclipse + +------------------------------------------------------------------- +Sun Nov 18 21:00:55 UTC 2018 - Fridrich Strba + +- Add maven pom file for xsltc + +------------------------------------------------------------------- +Wed Nov 7 13:13:56 UTC 2018 - Fridrich Strba + +- Add maven pom files for xalan-j2 and the serializer + +------------------------------------------------------------------- +Tue Oct 3 12:07:42 UTC 2017 - fstrba@suse.com + +- Added patch: + * openjdk-build.patch + + Fix build with different versions of OpenJDK +- Do not require gcc-java any more +- Run fdupes + +------------------------------------------------------------------- +Mon Dec 8 14:56:54 UTC 2014 - tchvatal@suse.com + +- Revert last commit, causes cycles. + +------------------------------------------------------------------- +Fri Dec 5 13:50:28 UTC 2014 - p.drouand@gmail.com + +- Replace java-1_5_0-gcj-compat-devel with javapackages-tools + +------------------------------------------------------------------- +Mon Jul 21 08:44:29 UTC 2014 - tchvatal@suse.com + +- Update-alternatives love. + +------------------------------------------------------------------- +Mon Jun 23 07:58:37 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner. + +------------------------------------------------------------------- +Mon Jun 23 07:55:54 UTC 2014 - tchvatal@suse.com + +- Version bump to 2.7.2 release: + * various small fixes + * Fix security bnc#870082 CVE-2014-0107 +- Fix few rpmlint warnings +- Deleted xalan-j2-java14compat.patch patch as we don't bother + with 1.4 java anymore +- Rebased patches on new code: + * xalan-j2-crosslink.patch + * xalan-j2-manifest.patch + * xalan-j2-noxsltcdeps.patch + +------------------------------------------------------------------- +Wed Aug 28 07:47:48 UTC 2013 - mvyskocil@suse.com + +- mark all files related to update-alternatives as ghost +- reformat header of spec a bit + +------------------------------------------------------------------- +Fri Aug 23 11:55:26 UTC 2013 - mvyskocil@suse.com + +- drop javadoc package + +------------------------------------------------------------------- +Mon Jan 7 12:19:14 UTC 2013 - mvyskocil@suse.com + +- remove xerces-j2-bootstrap depenency (bnc#789163) + +------------------------------------------------------------------- +Mon Nov 8 10:15:22 UTC 2010 - mvyskocil@suse.cz + +- ignore xml-commons-jaxp-1.3-apis + +------------------------------------------------------------------- +Mon May 4 17:50:26 CEST 2009 - mvyskocil@suse.cz + +- build with java-cup-bootstrap instead obsolete java_cup + +------------------------------------------------------------------- +Wed Mar 18 10:40:30 CET 2009 - mvyskocil@suse.cz + +- bnc#485299: Ant tasks fail with NoClassDefFoundError: + org/apache/xml/serializer/SerializerTrace + +------------------------------------------------------------------- +Mon Jul 28 15:15:42 CEST 2008 - ro@suse.de + +- use xml-commons-apis-bootstrap instead of xml-commons-apis + +------------------------------------------------------------------- +Mon Jul 28 09:04:55 CEST 2008 - coolo@suse.de + +- buildignore xml-commons (ant works without it) + +------------------------------------------------------------------- +Mon Jul 21 17:40:03 CEST 2008 - coolo@suse.de + +- build against gcj to avoid bootstrap problems + +------------------------------------------------------------------- +Thu Sep 21 16:36:24 CEST 2006 - skh@suse.de + +- update to version 2.7.0 from jpackage.org +- don't use icecream +- use target="1.4" for build with java 1.5 + +------------------------------------------------------------------- +Wed Jan 25 21:49:06 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Fri Jul 29 11:46:20 CEST 2005 - jsmeix@suse.de + +- Adjustments in the spec file. + +------------------------------------------------------------------- +Wed Jul 20 14:22:31 CEST 2005 - jsmeix@suse.de + +- Current version 2.6.0 from JPackage.org + +------------------------------------------------------------------- +Mon Jul 18 17:09:49 CEST 2005 - jsmeix@suse.de + +- Current version 2.6.0 from JPackage.org + +------------------------------------------------------------------- +Thu Sep 16 19:58:45 CEST 2004 - skh@suse.de + +- Fix prerequires + +------------------------------------------------------------------- +Thu Sep 2 18:44:39 CEST 2004 - skh@suse.de + +- Initial package created with version 2.6.0 (JPackage 1.5) + diff --git a/xalan-j2.spec b/xalan-j2.spec new file mode 100644 index 0000000..ab8971e --- /dev/null +++ b/xalan-j2.spec @@ -0,0 +1,228 @@ +# +# spec file for package xalan-j2 +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define cvs_version 2_7_3 +Name: xalan-j2 +Version: 2.7.3 +Release: 0 +Summary: Java XSLT processor +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://xalan.apache.org/index.html +Source0: https://www.apache.org/dist/xalan/xalan-j/source/xalan-j_%{cvs_version}-src.tar.gz +Source1: https://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom +Source2: https://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom +Source3: xsltc-%{version}.pom +Source4: xalan-j2-serializer-MANIFEST.MF +Source5: xalan-j2-MANIFEST.MF +# OSGi manifests +Patch0: %{name}-noxsltcdeps.patch +Patch1: %{name}-manifest.patch +Patch2: %{name}-crosslink.patch +Patch3: openjdk-build.patch +BuildRequires: ant +BuildRequires: bcel +BuildRequires: dos2unix +BuildRequires: fdupes +BuildRequires: java-cup-bootstrap +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local >= 6 +BuildRequires: jlex +BuildRequires: regexp +BuildRequires: servletapi5 +BuildRequires: xml-commons-apis-bootstrap +#!BuildIgnore: apache-commons-lang3 +#!BuildIgnore: java-cup +#!BuildIgnore: xerces-j2 +#!BuildIgnore: xml-commons +#!BuildIgnore: xml-commons-apis +#!BuildIgnore: xml-commons-jaxp-1.3-apis +#!BuildIgnore: xml-commons-resolver +Requires: jaxp_parser_impl +Requires(post): update-alternatives +Requires(postun): update-alternatives +Provides: jaxp_transform_impl +BuildArch: noarch + +%description +Xalan is an XSLT processor for transforming XML documents into HTML, +text, or other XML document types. It implements the W3C +Recommendations for XSL Transformations (XSLT) and the XML Path +Language (XPath). It can be used from the command line, in an applet or +a servlet, or as a module in other program. + +%package xsltc +Summary: Java XSLT compiler +Group: Development/Libraries/Java +Requires: bcel +Requires: java_cup +Requires: jaxp_parser_impl +Requires: jlex +Requires: regexp + +%description xsltc +The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets +into lightweight and portable Java byte codes called translets. + +%package manual +Summary: Manual for xalan-j2 +Group: Development/Libraries/Java + +%description manual +Xalan is an XSLT processor for transforming XML documents into HTML, +text, or other XML document types. It implements the W3C +Recommendations for XSL Transformations (XSLT) and the XML Path +Language (XPath). It can be used from the command line, in an applet or +a servlet, or as a module in other program. + +This package contains the manual for Xalan. + +%package demo +Summary: Demonstration and samples for xalan-j2 +Group: Development/Libraries/Java +Requires: %{name} = %{version}-%{release} +Requires: servlet + +%description demo +Xalan is an XSLT processor for transforming XML documents into HTML, +text, or other XML document types. It implements the W3C +Recommendations for XSL Transformations (XSLT) and the XML Path +Language (XPath). It can be used from the command line, in an applet or +a servlet, or as a module in other program. + +This package contains demonstration and sample files for Xalan. + +%prep +%setup -q -n xalan-j_%{cvs_version} +%patch -P 0 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 +%patch -P 3 -p1 +# 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 +done +mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar +mv tools/xalan2jtaglet.jar.no tools/xalan2jtaglet.jar +dos2unix KEYS LICENSE.txt NOTICE.txt xdocs/sources/xsltc/README.xsltc xdocs/sources/xsltc/README.xslt + +%build +if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi +pushd lib +ln -sf $(build-classpath java-cup-runtime) runtime.jar +ln -sf $(build-classpath bcel) bcel-6.7.0.jar +ln -sf $(build-classpath regexp) regexp.jar +ln -sf $(build-classpath xerces-j2) xercesImpl.jar +ln -sf $(build-classpath xml-commons-apis) xml-apis.jar +popd +pushd tools +ln -sf $(build-classpath java-cup) java_cup.jar +ln -sf $(build-classpath ant) ant.jar +ln -sf $(build-classpath jlex) JLex.jar +ln -sf $(build-classpath stylebook) stylebook-1.0-b3_xalan-2.jar +popd +%{ant} \ + -Dservlet-api.jar=$(build-classpath servletapi5) \ + -Dcompiler.source=1.8 -Dcompiler.target=1.8 \ + -Djava.awt.headless=true \ + -Dapi.j2se=%{_javadocdir}/java \ + -Dbuild.xalan-interpretive.jar=build/xalan-interpretive.jar \ + xalan-interpretive.jar\ + xsltc.unbundledjar \ + docs \ + xsltc.docs \ + samples \ + servlet + +# inject OSGi manifests +jar \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0} + --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \ +%endif + --update --file=build/serializer.jar --manifest=%{SOURCE4} +jar \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0} + --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \ +%endif + --update --file=build/xalan-interpretive.jar --manifest=%{SOURCE5} + +%install +# jars +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 build/xalan-interpretive.jar \ + %{buildroot}%{_javadir}/%{name}.jar +install -p -m 644 build/xsltc.jar \ + %{buildroot}%{_javadir}/xsltc.jar +install -p -m 644 build/serializer.jar \ + %{buildroot}%{_javadir}/%{name}-serializer.jar + +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar +%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}-serializer.pom +%add_maven_depmap %{name}-serializer.pom %{name}-serializer.jar +%{mvn_install_pom} %{SOURCE3} %{buildroot}%{_mavenpomdir}/xsltc.pom +%add_maven_depmap xsltc.pom xsltc.jar -f xsltc + +# demo +install -d -m 755 %{buildroot}%{_datadir}/%{name} +install -p -m 644 build/xalansamples.jar \ + %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar +install -p -m 644 build/xalanservlet.war \ + %{buildroot}%{_datadir}/%{name}/%{name}-servlet.war +cp -pr samples %{buildroot}%{_datadir}/%{name} +%fdupes -s %{buildroot}%{_datadir}/%{name} + +# alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +ln -sf %{_sysconfdir}/alternatives/jaxp_transform_impl.jar %{buildroot}%{_javadir}/jaxp_transform_impl.jar + +# bnc#485299 +install -d -m 0755 %{buildroot}/%{_sysconfdir}/ant.d/ +echo xalan-j2-serializer > %{buildroot}/%{_sysconfdir}/ant.d/serializer + +%post +update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \ + jaxp_transform_impl %{_javadir}/%{name}.jar 30 + +%preun +{ + [ $1 = 0 ] || exit 0 + update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar +} >/dev/null 2>&1 || : + +%files -f .mfiles +%defattr(0644,root,root,0755) +%license LICENSE.txt +%doc KEYS NOTICE.txt +%config %{_sysconfdir}/ant.d/serializer +%ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar +%{_javadir}/jaxp_transform_impl.jar + +%files xsltc -f .mfiles-xsltc + +%files manual +%defattr(0644,root,root,0755) +%doc build/docs/* + +%files demo +%defattr(0644,root,root,0755) +%{_datadir}/%{name} + +%changelog diff --git a/xalan-j_2_7_3-src.tar.gz b/xalan-j_2_7_3-src.tar.gz new file mode 100644 index 0000000..18a7af3 --- /dev/null +++ b/xalan-j_2_7_3-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:638453194b6eb68f07f8d6becb14ff849913d3e93991fb866994badb94556456 +size 13686458 diff --git a/xsltc-2.7.3.pom b/xsltc-2.7.3.pom new file mode 100644 index 0000000..ae25375 --- /dev/null +++ b/xsltc-2.7.3.pom @@ -0,0 +1,13 @@ + + 4.0.0 + xalan + xsltc + 2.7.3 + + + xalan + xalan + 2.7.3 + + + From 267bb43d485f2e3265f2773ade761d472643a65ecfc32a94dcb8c1adb4ad626c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 22 Sep 2024 10:04:30 +0000 Subject: [PATCH 2/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=48 --- xalan-j2.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xalan-j2.spec b/xalan-j2.spec index ab8971e..41adcbf 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -37,6 +37,7 @@ Patch2: %{name}-crosslink.patch Patch3: openjdk-build.patch BuildRequires: ant BuildRequires: bcel +BuildRequires: dejavu-fonts BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: java-cup-bootstrap @@ -46,9 +47,9 @@ BuildRequires: jlex BuildRequires: regexp BuildRequires: servletapi5 BuildRequires: xml-commons-apis-bootstrap +BuildRequires: xml-stylebook #!BuildIgnore: apache-commons-lang3 #!BuildIgnore: java-cup -#!BuildIgnore: xerces-j2 #!BuildIgnore: xml-commons #!BuildIgnore: xml-commons-apis #!BuildIgnore: xml-commons-jaxp-1.3-apis @@ -117,8 +118,6 @@ This package contains demonstration and sample files for Xalan. for j in $(find . -name "*.jar"); do mv $j $j.no done -mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar -mv tools/xalan2jtaglet.jar.no tools/xalan2jtaglet.jar dos2unix KEYS LICENSE.txt NOTICE.txt xdocs/sources/xsltc/README.xsltc xdocs/sources/xsltc/README.xslt %build @@ -129,12 +128,17 @@ ln -sf $(build-classpath bcel) bcel-6.7.0.jar ln -sf $(build-classpath regexp) regexp.jar ln -sf $(build-classpath xerces-j2) xercesImpl.jar ln -sf $(build-classpath xml-commons-apis) xml-apis.jar +pushd endorsed +ln -sf $(build-classpath xerces-j2) xercesImpl.jar +ln -sf $(build-classpath xml-commons-apis) xml-apis.jar +popd popd pushd tools ln -sf $(build-classpath java-cup) java_cup.jar ln -sf $(build-classpath ant) ant.jar ln -sf $(build-classpath jlex) JLex.jar -ln -sf $(build-classpath stylebook) stylebook-1.0-b3_xalan-2.jar +ln -sf $(build-classpath xml-stylebook) stylebook-1.0-b3_xalan-2.jar +ln -sf $(build-classpath xerces-j2) xercesImpl.jar popd %{ant} \ -Dservlet-api.jar=$(build-classpath servletapi5) \ From 6082c056d5daa705a12b1d030feaa3773bbf1e1d0766cae3bd33094c5bcc2777 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 22 Sep 2024 10:12:27 +0000 Subject: [PATCH 3/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=49 --- xalan-j2.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xalan-j2.spec b/xalan-j2.spec index 41adcbf..614151b 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -47,9 +47,9 @@ BuildRequires: jlex BuildRequires: regexp BuildRequires: servletapi5 BuildRequires: xml-commons-apis-bootstrap -BuildRequires: xml-stylebook #!BuildIgnore: apache-commons-lang3 #!BuildIgnore: java-cup +#!BuildIgnore: xerces-j2 #!BuildIgnore: xml-commons #!BuildIgnore: xml-commons-apis #!BuildIgnore: xml-commons-jaxp-1.3-apis @@ -118,6 +118,8 @@ This package contains demonstration and sample files for Xalan. for j in $(find . -name "*.jar"); do mv $j $j.no done +mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar +mv tools/xalan2jtaglet.jar.no tools/xalan2jtaglet.jar dos2unix KEYS LICENSE.txt NOTICE.txt xdocs/sources/xsltc/README.xsltc xdocs/sources/xsltc/README.xslt %build From aebb1e269b863bf4f3644ef932ec878066945811ea435b255e7feb5947cc7d73 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 22 Sep 2024 10:16:56 +0000 Subject: [PATCH 4/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=50 --- xalan-j2.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xalan-j2.spec b/xalan-j2.spec index 614151b..5a70a74 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -37,7 +37,6 @@ Patch2: %{name}-crosslink.patch Patch3: openjdk-build.patch BuildRequires: ant BuildRequires: bcel -BuildRequires: dejavu-fonts BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: java-cup-bootstrap From 119175cfef1fde1b9511754bd8c1dbf836155fd03a79354277ce80af36ca03b0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 22 Sep 2024 13:50:01 +0000 Subject: [PATCH 5/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=51 --- _multibuild | 3 ++ xalan-j2.spec | 144 +++++++++++++++++++++++++++++++------------------- 2 files changed, 94 insertions(+), 53 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..75e8197 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + extras + diff --git a/xalan-j2.spec b/xalan-j2.spec index 5a70a74..385865e 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -16,8 +16,19 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "extras" +%bcond_without extras +%else +%bcond_with extras +%endif %define cvs_version 2_7_3 -Name: xalan-j2 +%global base_name xalan-j2 +%if %{with extras} +Name: %{base_name}-extras +%else +Name: %{base_name} +%endif Version: 2.7.3 Release: 0 Summary: Java XSLT processor @@ -31,24 +42,18 @@ Source3: xsltc-%{version}.pom Source4: xalan-j2-serializer-MANIFEST.MF Source5: xalan-j2-MANIFEST.MF # OSGi manifests -Patch0: %{name}-noxsltcdeps.patch -Patch1: %{name}-manifest.patch -Patch2: %{name}-crosslink.patch +Patch0: %{base_name}-noxsltcdeps.patch +Patch1: %{base_name}-manifest.patch +Patch2: %{base_name}-crosslink.patch Patch3: openjdk-build.patch BuildRequires: ant -BuildRequires: bcel BuildRequires: dos2unix BuildRequires: fdupes -BuildRequires: java-cup-bootstrap BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 -BuildRequires: jlex -BuildRequires: regexp -BuildRequires: servletapi5 BuildRequires: xml-commons-apis-bootstrap #!BuildIgnore: apache-commons-lang3 #!BuildIgnore: java-cup -#!BuildIgnore: xerces-j2 #!BuildIgnore: xml-commons #!BuildIgnore: xml-commons-apis #!BuildIgnore: xml-commons-jaxp-1.3-apis @@ -58,6 +63,19 @@ Requires(post): update-alternatives Requires(postun): update-alternatives Provides: jaxp_transform_impl BuildArch: noarch +%if %{with extras} +BuildRequires: bcel +BuildRequires: dejavu-fonts +BuildRequires: java-cup-bootstrap +BuildRequires: jlex +BuildRequires: regexp +BuildRequires: servletapi5 +BuildRequires: xalan-j2 +BuildRequires: xerces-j2 +BuildRequires: xml-stylebook +%else +#!BuildIgnore: xerces-j2 +%endif %description Xalan is an XSLT processor for transforming XML documents into HTML, @@ -66,7 +84,7 @@ Recommendations for XSL Transformations (XSLT) and the XML Path Language (XPath). It can be used from the command line, in an applet or a servlet, or as a module in other program. -%package xsltc +%package -n %{base_name}-xsltc Summary: Java XSLT compiler Group: Development/Libraries/Java Requires: bcel @@ -75,15 +93,15 @@ Requires: jaxp_parser_impl Requires: jlex Requires: regexp -%description xsltc +%description -n %{base_name}-xsltc The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets into lightweight and portable Java byte codes called translets. -%package manual +%package -n %{base_name}-manual Summary: Manual for xalan-j2 Group: Development/Libraries/Java -%description manual +%description -n %{base_name}-manual Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types. It implements the W3C Recommendations for XSL Transformations (XSLT) and the XML Path @@ -92,13 +110,13 @@ a servlet, or as a module in other program. This package contains the manual for Xalan. -%package demo +%package -n %{base_name}-demo Summary: Demonstration and samples for xalan-j2 Group: Development/Libraries/Java -Requires: %{name} = %{version}-%{release} +Requires: %{base_name} = %{version}-%{release} Requires: servlet -%description demo +%description -n %{base_name}-demo Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types. It implements the W3C Recommendations for XSL Transformations (XSLT) and the XML Path @@ -113,46 +131,53 @@ This package contains demonstration and sample files for Xalan. %patch -P 1 -p1 %patch -P 2 -p1 %patch -P 3 -p1 -# 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 -done -mv tools/xalan2jdoc.jar.no tools/xalan2jdoc.jar -mv tools/xalan2jtaglet.jar.no tools/xalan2jtaglet.jar +# Remove all binary libs +find . -name "*.jar" -print -delete dos2unix KEYS LICENSE.txt NOTICE.txt xdocs/sources/xsltc/README.xsltc xdocs/sources/xsltc/README.xslt %build if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi pushd lib +%if %{with extras} ln -sf $(build-classpath java-cup-runtime) runtime.jar ln -sf $(build-classpath bcel) bcel-6.7.0.jar ln -sf $(build-classpath regexp) regexp.jar -ln -sf $(build-classpath xerces-j2) xercesImpl.jar -ln -sf $(build-classpath xml-commons-apis) xml-apis.jar +ln -sf $(build-classpath xml-apis) xml-apis.jar pushd endorsed ln -sf $(build-classpath xerces-j2) xercesImpl.jar -ln -sf $(build-classpath xml-commons-apis) xml-apis.jar +ln -sf $(build-classpath xml-apis) xml-apis.jar popd +%endif popd pushd tools -ln -sf $(build-classpath java-cup) java_cup.jar ln -sf $(build-classpath ant) ant.jar +%if %{with extras} +ln -sf $(build-classpath java-cup) java_cup.jar ln -sf $(build-classpath jlex) JLex.jar ln -sf $(build-classpath xml-stylebook) stylebook-1.0-b3_xalan-2.jar -ln -sf $(build-classpath xerces-j2) xercesImpl.jar +%endif popd +%if %{with extras} +mkdir -p build +pushd build +ln -sf $(build-classpath xalan-j2) xalan-interpretive.jar +popd +%endif + %{ant} \ -Dservlet-api.jar=$(build-classpath servletapi5) \ -Dcompiler.source=1.8 -Dcompiler.target=1.8 \ -Djava.awt.headless=true \ -Dapi.j2se=%{_javadocdir}/java \ -Dbuild.xalan-interpretive.jar=build/xalan-interpretive.jar \ - xalan-interpretive.jar\ +%if %{with extras} xsltc.unbundledjar \ docs \ xsltc.docs \ samples \ servlet +%else + xalan-interpretive.jar # inject OSGi manifests jar \ @@ -165,34 +190,28 @@ jar \ --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \ %endif --update --file=build/xalan-interpretive.jar --manifest=%{SOURCE5} +%endif %install # jars install -d -m 755 %{buildroot}%{_javadir} +%if %{without extras} install -p -m 644 build/xalan-interpretive.jar \ - %{buildroot}%{_javadir}/%{name}.jar + %{buildroot}%{_javadir}/%{base_name}.jar +install -p -m 644 build/serializer.jar \ + %{buildroot}%{_javadir}/%{base_name}-serializer.jar +%else install -p -m 644 build/xsltc.jar \ %{buildroot}%{_javadir}/xsltc.jar -install -p -m 644 build/serializer.jar \ - %{buildroot}%{_javadir}/%{name}-serializer.jar +%endif # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom -%add_maven_depmap %{name}.pom %{name}.jar -%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}-serializer.pom -%add_maven_depmap %{name}-serializer.pom %{name}-serializer.jar -%{mvn_install_pom} %{SOURCE3} %{buildroot}%{_mavenpomdir}/xsltc.pom -%add_maven_depmap xsltc.pom xsltc.jar -f xsltc - -# demo -install -d -m 755 %{buildroot}%{_datadir}/%{name} -install -p -m 644 build/xalansamples.jar \ - %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar -install -p -m 644 build/xalanservlet.war \ - %{buildroot}%{_datadir}/%{name}/%{name}-servlet.war -cp -pr samples %{buildroot}%{_datadir}/%{name} -%fdupes -s %{buildroot}%{_datadir}/%{name} +%if %{without extras} +%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{base_name}.pom +%add_maven_depmap %{base_name}.pom %{base_name}.jar +%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{base_name}-serializer.pom +%add_maven_depmap %{base_name}-serializer.pom %{base_name}-serializer.jar # alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives @@ -204,14 +223,29 @@ echo xalan-j2-serializer > %{buildroot}/%{_sysconfdir}/ant.d/serializer %post update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \ - jaxp_transform_impl %{_javadir}/%{name}.jar 30 + jaxp_transform_impl %{_javadir}/%{base_name}.jar 30 %preun { [ $1 = 0 ] || exit 0 - update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar + update-alternatives --remove jaxp_transform_impl %{_javadir}/%{base_name}.jar } >/dev/null 2>&1 || : +%else +%{mvn_install_pom} %{SOURCE3} %{buildroot}%{_mavenpomdir}/xsltc.pom +%add_maven_depmap xsltc.pom xsltc.jar -f xsltc + +# demo +install -d -m 755 %{buildroot}%{_datadir}/%{base_name} +install -p -m 644 build/xalansamples.jar \ + %{buildroot}%{_datadir}/%{base_name}/%{base_name}-samples.jar +install -p -m 644 build/xalanservlet.war \ + %{buildroot}%{_datadir}/%{base_name}/%{base_name}-servlet.war +cp -pr samples %{buildroot}%{_datadir}/%{base_name} +%fdupes -s %{buildroot}%{_datadir}/%{base_name} +%endif + +%if %{without extras} %files -f .mfiles %defattr(0644,root,root,0755) %license LICENSE.txt @@ -220,14 +254,18 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \ %ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar %{_javadir}/jaxp_transform_impl.jar -%files xsltc -f .mfiles-xsltc +%else -%files manual +%files -n %{base_name}-xsltc -f .mfiles-xsltc + +%files -n %{base_name}-manual %defattr(0644,root,root,0755) %doc build/docs/* -%files demo +%files -n %{base_name}-demo %defattr(0644,root,root,0755) -%{_datadir}/%{name} +%{_datadir}/%{base_name} + +%endif %changelog From 2ca3911b31f65140942023299c06ba675356e60ecdcdeebd47660e46cbb92c0b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 22 Sep 2024 14:45:21 +0000 Subject: [PATCH 6/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=52 --- _service | 18 ++ openjdk-build.patch | 532 +++++++++++++++++-------------------- xalan-j2-2.7.3.tar.xz | 3 + xalan-j2-crosslink.patch | 61 ++--- xalan-j2-manifest.patch | 218 +++++++-------- xalan-j2-noxsltcdeps.patch | 25 +- xalan-j2.spec | 43 +-- xalan-j_2_7_3-src.tar.gz | 3 - 8 files changed, 442 insertions(+), 461 deletions(-) create mode 100644 _service create mode 100644 xalan-j2-2.7.3.tar.xz delete mode 100644 xalan-j_2_7_3-src.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..6390b4f --- /dev/null +++ b/_service @@ -0,0 +1,18 @@ + + + git + https://github.com/apache/xalan-java.git + xalan-j_2_7_3-rc10 + xalan-j_* + @PARENT_TAG@ + xalan-j_(\d+)_(\d+)_(\d+).* + \1.\2.\3 + xalan-j2 + **/*.jar + + + *.tar + xz + + + diff --git a/openjdk-build.patch b/openjdk-build.patch index d8ec465..b38598f 100644 --- a/openjdk-build.patch +++ b/openjdk-build.patch @@ -1,288 +1,244 @@ -diff -urEbwB xalan-j_2_7_3.orig/build.xml xalan-j_2_7_3/build.xml ---- xalan-j_2_7_3.orig/build.xml 2023-08-30 18:36:44.177771503 +0200 -+++ xalan-j_2_7_3/build.xml 2023-08-30 18:49:32.266249508 +0200 -@@ -221,14 +221,12 @@ - - - -- - - - - - - -- - - - -@@ -237,7 +235,6 @@ - - - -- - - - -@@ -398,7 +395,6 @@ - - -- - - - -@@ -414,6 +410,12 @@ - - -+ -+ -+ -+ -+ - - - - -- - - - -@@ -454,7 +455,6 @@ - - -- - - - -@@ -469,7 +469,6 @@ - target="${compiler.target}" source="${compiler.source}" - nowarn="${compiler.nowarn}"> - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@@ -889,7 +886,6 @@ - - -@@ -930,14 +926,14 @@ - - - - - -@@ -951,7 +947,7 @@ - - - - - -@@ -989,7 +985,7 @@ - - - -@@ -1008,7 +1004,7 @@ - - -@@ -1627,7 +1623,7 @@ - - -+ classpath="${build.xalan.jar}:${bin.dir}/fop.jar:${bin.dir}/w3c.jar"> - - - -@@ -1764,7 +1760,6 @@ - nowarn="${compiler.nowarn}"> - - -- - - - -Only in xalan-j_2_7_3: build.xml.orig -Only in xalan-j_2_7_3: build.xml.rej +diff --git a/build.xml b/build.xml +index 2a2703a..20fe6e4 100644 +--- a/build.xml ++++ b/build.xml +@@ -391,7 +391,6 @@ $Id$ + + +- + + + +@@ -407,6 +406,12 @@ $Id$ + + ++ ++ ++ ++ ++ + + + + +- + + + +@@ -461,7 +465,6 @@ $Id$ + target="${compiler.target}" source="${compiler.source}" + nowarn="${compiler.nowarn}"> + +- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +@@ -881,7 +882,6 @@ $Id$ + + +@@ -924,12 +924,12 @@ $Id$ + + + +@@ -943,7 +943,7 @@ $Id$ + + + + + +@@ -981,7 +981,7 @@ $Id$ + + + +@@ -1000,7 +1000,7 @@ $Id$ + + +@@ -1760,7 +1760,6 @@ $Id$ + nowarn="${compiler.nowarn}"> + + +- + + + diff --git a/xalan-j2-2.7.3.tar.xz b/xalan-j2-2.7.3.tar.xz new file mode 100644 index 0000000..ae85736 --- /dev/null +++ b/xalan-j2-2.7.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b23df4651fd1f0ee7136eef67557f5646d829562573546bc263aa5e90b0d7a14 +size 2290972 diff --git a/xalan-j2-crosslink.patch b/xalan-j2-crosslink.patch index 53f2407..89eb1ea 100644 --- a/xalan-j2-crosslink.patch +++ b/xalan-j2-crosslink.patch @@ -1,30 +1,31 @@ -diff -urN xalan-j_2_7_2.old/build.xml xalan-j_2_7_2/build.xml ---- xalan-j_2_7_2.old/build.xml 2014-06-23 09:21:30.815410307 +0200 -+++ xalan-j_2_7_2/build.xml 2014-06-23 09:22:59.124418473 +0200 -@@ -204,7 +204,9 @@ - - - -- -+ -+ -+ - - - -@@ -1098,6 +1100,7 @@ - - -+ - - - -@@ -1133,6 +1136,7 @@ - - -+ - - - +diff --git a/build.xml b/build.xml +index df58558..2a2703a 100644 +--- a/build.xml ++++ b/build.xml +@@ -205,7 +205,9 @@ $Id$ + + + +- ++ ++ ++ + + + +@@ -1120,6 +1122,7 @@ $Id$ + + ++ + + + +@@ -1155,6 +1158,7 @@ $Id$ + + ++ + + + diff --git a/xalan-j2-manifest.patch b/xalan-j2-manifest.patch index fe55e2c..6824c5c 100644 --- a/xalan-j2-manifest.patch +++ b/xalan-j2-manifest.patch @@ -1,111 +1,115 @@ -diff -urEbwB xalan-j_2_7_3.orig/src/MANIFEST.MF xalan-j_2_7_3/src/MANIFEST.MF ---- xalan-j_2_7_3.orig/src/MANIFEST.MF 2023-08-30 18:36:44.211105060 +0200 -+++ xalan-j_2_7_3/src/MANIFEST.MF 2023-08-30 18:39:12.542098631 +0200 +diff --git a/src/MANIFEST.MF b/src/MANIFEST.MF +index 15a12ae..43c7c3b 100644 +--- a/src/MANIFEST.MF ++++ b/src/MANIFEST.MF @@ -1,7 +1,6 @@ - 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 - - - Name: org/apache/xalan/ -@@ -38,33 +37,3 @@ - Implementation-Vendor: Apache Software Foundation - Implementation-URL: https://xalan.apache.org/xalan-j/ - --Name: java_cup/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: Apache Commons Byte Code Engineering Library --Specification-Title: Apache Commons BCEL --Specification-Vendor: Apache Software Foundation --Specification-Version: 6.7.0 --Implementation-Title: org.apache.bcel --Implementation-Version: @impl.version@ --Implementation-Vendor: Apache Software Foundation --Implementation-URL: https://commons.apache.org/proper/commons-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 -urEbwB xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER xalan-j_2_7_3/src/MANIFEST.SERIALIZER ---- xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER 2023-08-30 18:36:44.211105060 +0200 -+++ xalan-j_2_7_3/src/MANIFEST.SERIALIZER 2023-08-30 18:38:46.375256700 +0200 + 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 + + + Name: org/apache/xalan/ +@@ -38,33 +37,3 @@ Implementation-Version: @impl.version@ + Implementation-Vendor: Apache Software Foundation + Implementation-URL: https://xalan.apache.org/xalan-j/ + +-Name: java_cup/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: Apache Commons Byte Code Engineering Library +-Specification-Title: Apache Commons BCEL +-Specification-Vendor: Apache Software Foundation +-Specification-Version: 6.7.0 +-Implementation-Title: org.apache.bcel +-Implementation-Version: @impl.version@ +-Implementation-Vendor: Apache Software Foundation +-Implementation-URL: https://commons.apache.org/proper/commons-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/src/MANIFEST.SERIALIZER b/src/MANIFEST.SERIALIZER +index 54be291..4bc1c11 100644 +--- a/src/MANIFEST.SERIALIZER ++++ b/src/MANIFEST.SERIALIZER @@ -1,7 +1,6 @@ - Manifest-Version: 1.0 - Created-By: @java.version@ (@java.vendor@) - Main-Class: org.apache.xml.serializer.Version --Class-Path: xml-apis.jar - - Name: org/apache/xml/serializer/ - Comment: Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input SAX events. -diff -urEbwB xalan-j_2_7_3.orig/src/manifest.xalan-interpretive xalan-j_2_7_3/src/manifest.xalan-interpretive ---- xalan-j_2_7_3.orig/src/manifest.xalan-interpretive 2023-08-30 18:36:44.211105060 +0200 -+++ xalan-j_2_7_3/src/manifest.xalan-interpretive 2023-08-30 18:38:46.375256700 +0200 + Manifest-Version: 1.0 + Created-By: @java.version@ (@java.vendor@) + Main-Class: org.apache.xml.serializer.Version +-Class-Path: xml-apis.jar + + Name: org/apache/xml/serializer/ + Comment: Serializer to write out XML, HTML etc. as a stream of characters from an input DOM or from input SAX events. +diff --git a/src/manifest.xalan-interpretive b/src/manifest.xalan-interpretive +index fd5882a..f1c895e 100644 +--- a/src/manifest.xalan-interpretive ++++ b/src/manifest.xalan-interpretive @@ -1,7 +1,6 @@ - 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 - - Name: org/apache/xalan/ - Comment: Main Xalan engine implementing TrAX/JAXP -diff -urEbwB xalan-j_2_7_3.orig/src/manifest.xsltc xalan-j_2_7_3/src/manifest.xsltc ---- xalan-j_2_7_3.orig/src/manifest.xsltc 2023-08-30 18:36:44.211105060 +0200 -+++ xalan-j_2_7_3/src/manifest.xsltc 2023-08-30 18:39:52.469032707 +0200 + 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 + + Name: org/apache/xalan/ + Comment: Main Xalan engine implementing TrAX/JAXP +diff --git a/src/manifest.xsltc b/src/manifest.xsltc +index fd24887..2c99f38 100644 +--- a/src/manifest.xsltc ++++ b/src/manifest.xsltc @@ -1,6 +1,5 @@ - Manifest-Version: 1.0 - Created-By: @java.version@ (@java.vendor@) --Class-Path: xercesImpl.jar xml-apis.jar serializer.jar - - Name: org/apache/xalan/xsltc/ - Comment: Main XSLTC engine implementing TrAX/JAXP -@@ -19,33 +18,3 @@ - Implementation-Vendor: Apache Software Foundation - Implementation-URL: http://xml.apache.org/xalan-j/dist/ - --Name: java_cup/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: 6.6.0 --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@) +-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar + + Name: org/apache/xalan/xsltc/ + Comment: Main XSLTC engine implementing TrAX/JAXP +@@ -19,33 +18,3 @@ Implementation-Version: @impl.version@ + Implementation-Vendor: Apache Software Foundation + Implementation-URL: http://xml.apache.org/xalan-j/dist/ + +-Name: java_cup/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: 6.6.0 +-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 b2cc2dc..900d0c6 100644 --- a/xalan-j2-noxsltcdeps.patch +++ b/xalan-j2-noxsltcdeps.patch @@ -1,12 +1,13 @@ -diff -urN xalan-j_2_7_2.old/build.xml xalan-j_2_7_2/build.xml ---- xalan-j_2_7_2.old/build.xml 2014-06-23 09:21:30.815410307 +0200 -+++ xalan-j_2_7_2/build.xml 2014-06-23 09:25:00.547429701 +0200 -@@ -616,7 +616,7 @@ - - - -- - - +diff --git a/build.xml b/build.xml +index 55c7d38..df58558 100644 +--- a/build.xml ++++ b/build.xml +@@ -616,7 +616,7 @@ $Id$ + + + +- + + diff --git a/xalan-j2.spec b/xalan-j2.spec index 385865e..db28f74 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -24,18 +24,13 @@ %endif %define cvs_version 2_7_3 %global base_name xalan-j2 -%if %{with extras} -Name: %{base_name}-extras -%else -Name: %{base_name} -%endif Version: 2.7.3 Release: 0 Summary: Java XSLT processor License: Apache-2.0 Group: Development/Libraries/Java URL: https://xalan.apache.org/index.html -Source0: https://www.apache.org/dist/xalan/xalan-j/source/xalan-j_%{cvs_version}-src.tar.gz +Source0: %{base_name}-%{version}.tar.xz Source1: https://repo1.maven.org/maven2/xalan/xalan/%{version}/xalan-%{version}.pom Source2: https://repo1.maven.org/maven2/xalan/serializer/%{version}/serializer-%{version}.pom Source3: xsltc-%{version}.pom @@ -64,6 +59,11 @@ Requires(postun): update-alternatives Provides: jaxp_transform_impl BuildArch: noarch %if %{with extras} +Name: %{base_name}-extras +%else +Name: %{base_name} +%endif +%if %{with extras} BuildRequires: bcel BuildRequires: dejavu-fonts BuildRequires: java-cup-bootstrap @@ -126,14 +126,11 @@ a servlet, or as a module in other program. This package contains demonstration and sample files for Xalan. %prep -%setup -q -n xalan-j_%{cvs_version} +%setup -q -n %{base_name}-%{version} %patch -P 0 -p1 %patch -P 1 -p1 %patch -P 2 -p1 %patch -P 3 -p1 -# Remove all binary libs -find . -name "*.jar" -print -delete -dos2unix KEYS LICENSE.txt NOTICE.txt xdocs/sources/xsltc/README.xsltc xdocs/sources/xsltc/README.xslt %build if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{java_home}" ; fi @@ -165,12 +162,12 @@ popd %endif %{ant} \ - -Dservlet-api.jar=$(build-classpath servletapi5) \ -Dcompiler.source=1.8 -Dcompiler.target=1.8 \ -Djava.awt.headless=true \ -Dapi.j2se=%{_javadocdir}/java \ -Dbuild.xalan-interpretive.jar=build/xalan-interpretive.jar \ %if %{with extras} + -Dservlet-api.jar=$(build-classpath servletapi5) \ xsltc.unbundledjar \ docs \ xsltc.docs \ @@ -190,6 +187,7 @@ jar \ --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \ %endif --update --file=build/xalan-interpretive.jar --manifest=%{SOURCE5} + %endif %install @@ -221,16 +219,6 @@ ln -sf %{_sysconfdir}/alternatives/jaxp_transform_impl.jar %{buildroot}%{_javadi install -d -m 0755 %{buildroot}/%{_sysconfdir}/ant.d/ echo xalan-j2-serializer > %{buildroot}/%{_sysconfdir}/ant.d/serializer -%post -update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \ - jaxp_transform_impl %{_javadir}/%{base_name}.jar 30 - -%preun -{ - [ $1 = 0 ] || exit 0 - update-alternatives --remove jaxp_transform_impl %{_javadir}/%{base_name}.jar -} >/dev/null 2>&1 || : - %else %{mvn_install_pom} %{SOURCE3} %{buildroot}%{_mavenpomdir}/xsltc.pom %add_maven_depmap xsltc.pom xsltc.jar -f xsltc @@ -243,9 +231,22 @@ install -p -m 644 build/xalanservlet.war \ %{buildroot}%{_datadir}/%{base_name}/%{base_name}-servlet.war cp -pr samples %{buildroot}%{_datadir}/%{base_name} %fdupes -s %{buildroot}%{_datadir}/%{base_name} + +# manual +%fdupes -s build/docs %endif %if %{without extras} +%post +update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \ + jaxp_transform_impl %{_javadir}/%{base_name}.jar 30 + +%preun +{ + [ $1 = 0 ] || exit 0 + update-alternatives --remove jaxp_transform_impl %{_javadir}/%{base_name}.jar +} >/dev/null 2>&1 || : + %files -f .mfiles %defattr(0644,root,root,0755) %license LICENSE.txt diff --git a/xalan-j_2_7_3-src.tar.gz b/xalan-j_2_7_3-src.tar.gz deleted file mode 100644 index 18a7af3..0000000 --- a/xalan-j_2_7_3-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:638453194b6eb68f07f8d6becb14ff849913d3e93991fb866994badb94556456 -size 13686458 From 069275c6695dd1ab786ddf96ce3b69b88744a8a58551c045bfff488e098d991c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 22 Sep 2024 18:41:39 +0000 Subject: [PATCH 7/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=53 --- xalan-j2.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xalan-j2.spec b/xalan-j2.spec index db28f74..ed78d87 100644 --- a/xalan-j2.spec +++ b/xalan-j2.spec @@ -139,7 +139,6 @@ pushd lib ln -sf $(build-classpath java-cup-runtime) runtime.jar ln -sf $(build-classpath bcel) bcel-6.7.0.jar ln -sf $(build-classpath regexp) regexp.jar -ln -sf $(build-classpath xml-apis) xml-apis.jar pushd endorsed ln -sf $(build-classpath xerces-j2) xercesImpl.jar ln -sf $(build-classpath xml-apis) xml-apis.jar @@ -157,7 +156,7 @@ popd %if %{with extras} mkdir -p build pushd build -ln -sf $(build-classpath xalan-j2) xalan-interpretive.jar +ln -sf $(build-classpath %{base_name}) xalan-interpretive.jar popd %endif From 540bf6b503bedd9a69d38dd88f8eeef483d5b0015461165539a19aa3d294e664 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 23 Sep 2024 14:45:49 +0000 Subject: [PATCH 8/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=54 --- xalan-j2.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xalan-j2.changes b/xalan-j2.changes index d5e9362..0cbbc14 100644 --- a/xalan-j2.changes +++ b/xalan-j2.changes @@ -2,6 +2,15 @@ Sun Sep 22 07:00:22 UTC 2024 - Fridrich Strba - Use SOURCE_DATE_EPOCH for reproducible builds +- Split into two _multibuild flavours to avoid use of binary jars + and prevent build cycles +- Fetch the sources from git and clean the tarball of binary jars +- Modified patches: + * xalan-j2-crosslink.patch + * xalan-j2-manifest.patch + * xalan-j2-noxsltcdeps.patch + + adapt to different line-endings and to slightly changed + context ------------------------------------------------------------------- Wed Feb 21 16:24:59 UTC 2024 - Fridrich Strba From 8fe771b86bd0764be4a1acf92f6fbf22d4bcc0e90860ee77530d2dd85bf2a1e1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 23 Sep 2024 14:46:18 +0000 Subject: [PATCH 9/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=55 --- xalan-j2.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/xalan-j2.changes b/xalan-j2.changes index 0cbbc14..d667e50 100644 --- a/xalan-j2.changes +++ b/xalan-j2.changes @@ -6,6 +6,7 @@ Sun Sep 22 07:00:22 UTC 2024 - Fridrich Strba and prevent build cycles - Fetch the sources from git and clean the tarball of binary jars - Modified patches: + * openjdk-build.patch * xalan-j2-crosslink.patch * xalan-j2-manifest.patch * xalan-j2-noxsltcdeps.patch