don't require update-alteantives

Do not require the jaxp_parser_impl, but xerces-j2 directly
bsc#12459312
2025-09-05 09:32:03 +02:00 · 2025-09-05 08:57:02 +02:00 · 2025-09-05 08:24:19 +02:00 · 2024-09-24 15:31:25 +00:00 · 2024-09-23 14:46:18 +00:00 · 2024-09-23 14:45:49 +00:00
10 changed files with 555 additions and 515 deletions
--- a/3
+++ b/3
@@ -0,0 +1,3 @@
 <multibuild>
  <package>extras</package>
 </multibuild>
--- a/18
+++ b/18
@@ -0,0 +1,18 @@
 <services>
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">https://github.com/apache/xalan-java.git</param>
 		<param name="revision">xalan-j_2_7_3-rc10</param>
 		<param name="match-tag">xalan-j_*</param>
 		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="versionrewrite-pattern">xalan-j_(\d+)_(\d+)_(\d+).*</param>
 		<param name="versionrewrite-replacement">\1.\2.\3</param>
 		<param name="filename">xalan-j2</param>
        <param name="exclude">**/*.jar</param>
 	</service>
 	<service name="recompress" mode="disabled">
 		<param name="file">*.tar</param>
 		<param name="compression">xz</param>
 	</service>
 	<service name="set_version" mode="disabled"/>
 </services>
--- 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
+diff --git a/build.xml b/build.xml
--- xalan-j_2_7_3.orig/build.xml	2023-08-30 18:36:44.177771503 +0200
+index 2a2703a..20fe6e4 100644
-+++ xalan-j_2_7_3/build.xml	2023-08-30 18:49:32.266249508 +0200
+--- a/build.xml
-@@ -221,14 +221,12 @@
+++ b/build.xml
-     <pathelement location="${taglet.jar}" />
+@@ -391,7 +391,6 @@ $Id$
-     <pathelement location="${build.serializer.jar}" />
+       <exclude name="**/IncrementalSAXSource_Xerces.java" 
-     <pathelement location="${build.xalan.jar}" />
+         unless="xerces.present"	 />
-    <pathelement path="${java.class.path}" />
+       <classpath refid="compile.class.path" />
-   </path>
+-      <bootclasspath refid="xslt.boot.class.path" />
-   <path id="samples.class.path">
+     </javac>
-     <pathelement location="${xmlapis.jar}" />
+     <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
-     <pathelement location="${build.serializer.jar}" />    
+     <copy todir="${build.classes}">
-     <pathelement location="${parser.jar}" />  
+@@ -407,6 +406,12 @@ $Id$
-     <pathelement location="${build.xalan.jar}" />
+   <!-- =================================================================== -->
-    <pathelement path="${java.class.path}" />
+   <target name="xalan-interpretive.compile" depends="xml.compile"
-   </path>
+     description="Compile the Xalan interpretive classes (skips XSLTC)" >
-   <path id="compile.class.path">
+
-     <!-- Ensure the selected parser.jar file is used to compile against -->
+    <gunzip src="${xml-commons-srcs.tar.gz}" dest="${build.dir}" />
-@@ -237,7 +235,6 @@
+    <untar src="${xml-commons-srcs.tar}"
-     <pathelement location="${xmlapis.jar}" />
+           dest="${src.dir}">
-     <pathelement location="${build.serializer.jar}" />
+    </untar>
-     <pathelement location="${parser.jar}" />
+
-    <pathelement path="${java.class.path}" />
+     <echo message="Compiling Xalan interpretive classes" />
-   </path>
+     <javac srcdir="${src.dir}" 
- 	
+            destdir="${build.classes}"
-   <path id="xslt.boot.class.path">
+@@ -418,7 +423,6 @@ $Id$
-@@ -398,7 +395,6 @@
+       <include name="${xalan.reldir}/**/*.java" />
-       <exclude name="**/IncrementalSAXSource_Xerces.java" 
+       <exclude name="${xsltc.reldir}/**/*.java" />
-         unless="xerces.present"	 />
+       <classpath refid="compile.class.path" />
-       <classpath refid="compile.class.path" />
+-      <bootclasspath refid="xslt.boot.class.path" />
-      <bootclasspath refid="xslt.boot.class.path" />
+       <sourcepath refid="compile.source.path" />
-     </javac>
+     </javac>
-     <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
+     <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
-     <copy todir="${build.classes}">
+@@ -461,7 +465,6 @@ $Id$
-@@ -414,6 +410,12 @@
+     	   target="${compiler.target}" source="${compiler.source}" 
-   <!-- =================================================================== -->
+     	   nowarn="${compiler.nowarn}">
-   <target name="xalan-interpretive.compile" depends="xml.compile"
+       <classpath refid="xsltc.class.path" />
-     description="Compile the Xalan interpretive classes (skips XSLTC)" >
+-      <bootclasspath refid="xslt.boot.class.path" />
-+
+     </javac>
-+    <gunzip src="${xml-commons-srcs.tar.gz}" dest="${build.dir}" />                                                                         
+     <!-- These tricky uptodate statements hopefully determine if we 
-+    <untar src="${xml-commons-srcs.tar}" 
+          actually need to generate the java_cup and jlex files 
-+           dest="${src.dir}">
+@@ -526,7 +529,6 @@ $Id$
-+    </untar>
+     	   target="${compiler.target}" source="${compiler.source}" 
-+
+     	   nowarn="${compiler.nowarn}"> 
-     <echo message="Compiling Xalan interpretive classes" />
+       <classpath refid="xsltc.class.path" />
-     <javac srcdir="${src.dir}" 
+-      <bootclasspath refid="xslt.boot.class.path" />
-            destdir="${build.classes}"
+     </javac>
-@@ -425,7 +427,6 @@
+   </target>
-       <include name="${xalan.reldir}/**/*.java" />
+ 
-       <exclude name="${xsltc.reldir}/**/*.java" />
+@@ -541,7 +543,6 @@ $Id$
-       <classpath refid="compile.class.path" />
+     	   target="${compiler.target}" source="${compiler.source}" 
-      <bootclasspath refid="xslt.boot.class.path" />
+     	   nowarn="${compiler.nowarn}">
-       <sourcepath refid="compile.source.path" />
+       <classpath refid="xsltc.class.path" />
-     </javac>
+-      <bootclasspath refid="xslt.boot.class.path" />
-     <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
+     </javac>
-@@ -454,7 +455,6 @@
+   </target>
-     <!-- build.classes needed for 
+ 
-          org.apache.xalan.xsltc.util.JavaCupRedirect -->
+@@ -740,104 +741,104 @@ $Id$
-     <pathelement location="${build.classes}" />
+     <!-- Since the samples are packageless, they must be compiled separately. -->   
-    <pathelement path="${java.class.path}" />
+     <javac srcdir="${samples.dir}/SimpleTransform" 
-   </path>
+            destdir="${build.samples}"  excludes="${exclude}"
- 
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-   <!-- Attempt to determine dependency info for generated sources -->
+           debug="${build.debug}"
-@@ -469,7 +469,6 @@
+     	   target="${compiler.target}" source="${compiler.source}" 
-     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
-     	   nowarn="${compiler.nowarn}">
+       <classpath refid="samples.class.path" />
-       <classpath refid="xsltc.class.path" />
+     </javac>           
-      <bootclasspath refid="xslt.boot.class.path" />
+     <javac srcdir="${samples.dir}/UseStylesheetPI"   
-     </javac>
+            destdir="${build.samples}"  excludes="${exclude}"
-     <!-- These tricky uptodate statements hopefully determine if we 
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-          actually need to generate the java_cup and jlex files 
+           debug="${build.debug}"
-@@ -534,7 +533,6 @@
+     	   target="${compiler.target}" source="${compiler.source}" 
-     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
-     	   nowarn="${compiler.nowarn}"> 
+       <classpath refid="samples.class.path" />
-       <classpath refid="xsltc.class.path" />
+     </javac>           
-      <bootclasspath refid="xslt.boot.class.path" />
+     <javac srcdir="${samples.dir}/UseStylesheetParam" 
-     </javac>
+            destdir="${build.samples}"  excludes="${exclude}"
-   </target>
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
- 
+           debug="${build.debug}"
-@@ -549,7 +547,6 @@
+     	   target="${compiler.target}" source="${compiler.source}" 
-     	   target="${compiler.target}" source="${compiler.source}"
+     	   nowarn="${compiler.nowarn}">
-     	   nowarn="${compiler.nowarn}">
+       <classpath refid="samples.class.path" />
-       <classpath refid="xsltc.class.path" />
+     </javac>           
-      <bootclasspath refid="xslt.boot.class.path" />
+     <javac srcdir="${samples.dir}/SAX2SAX"  
-     </javac>
+            destdir="${build.samples}"  excludes="${exclude}"
-   </target>
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
- 
+           debug="${build.debug}"
-@@ -748,104 +745,104 @@
+     	   target="${compiler.target}" source="${compiler.source}" 
-     <!-- Since the samples are packageless, they must be compiled separately. -->   
+     	   nowarn="${compiler.nowarn}">
-     <javac srcdir="${samples.dir}/SimpleTransform" 
+       <classpath refid="samples.class.path" />
-            destdir="${build.samples}"  excludes="${exclude}"
+     </javac>           
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+     <javac srcdir="${samples.dir}/DOM2DOM"  
-+           debug="${build.debug}"
+            destdir="${build.samples}"  excludes="${exclude}"
-     	   target="${compiler.target}" source="${compiler.source}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-     	   nowarn="${compiler.nowarn}">
+           debug="${build.debug}"
-       <classpath refid="samples.class.path" />
+     	   target="${compiler.target}" source="${compiler.source}" 
-     </javac>           
+     	   nowarn="${compiler.nowarn}">
-     <javac srcdir="${samples.dir}/UseStylesheetPI"   
+       <classpath refid="samples.class.path" />
-            destdir="${build.samples}"  excludes="${exclude}"
+     </javac>           
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+     <javac srcdir="${samples.dir}/Pipe"  
-+           debug="${build.debug}"
+            destdir="${build.samples}"  excludes="${exclude}"
-     	   target="${compiler.target}" source="${compiler.source}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-     	   nowarn="${compiler.nowarn}">
+           debug="${build.debug}"
-       <classpath refid="samples.class.path" />
+     	   nowarn="${compiler.nowarn}">
-     </javac>           
+       <classpath refid="samples.class.path" />
-     <javac srcdir="${samples.dir}/UseStylesheetParam" 
+     </javac>           
-            destdir="${build.samples}"  excludes="${exclude}"
+     <javac srcdir="${samples.dir}/UseXMLFilters"  
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+            destdir="${build.samples}"  excludes="${exclude}"
-+           debug="${build.debug}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-     	   target="${compiler.target}" source="${compiler.source}"
+           debug="${build.debug}"
-     	   nowarn="${compiler.nowarn}">
+     	   target="${compiler.target}" source="${compiler.source}" 
-       <classpath refid="samples.class.path" />
+     	   nowarn="${compiler.nowarn}">
-     </javac>           
+       <classpath refid="samples.class.path" />
-     <javac srcdir="${samples.dir}/SAX2SAX"  
+     </javac>           
-            destdir="${build.samples}"  excludes="${exclude}"
+     <javac srcdir="${samples.dir}/Trace"   
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+            destdir="${build.samples}"  excludes="${exclude}"
-+           debug="${build.debug}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-     	   target="${compiler.target}" source="${compiler.source}"
+           debug="${build.debug}"
-     	   nowarn="${compiler.nowarn}">
+     	   target="${compiler.target}" source="${compiler.source}" 
-       <classpath refid="samples.class.path" />
+     	   nowarn="${compiler.nowarn}">
-     </javac>           
+       <classpath refid="samples.class.path" />
-     <javac srcdir="${samples.dir}/DOM2DOM"  
+     </javac>           
-            destdir="${build.samples}"  excludes="${exclude}"
+     <javac srcdir="${samples.dir}/ApplyXPath"  
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+            destdir="${build.samples}" excludes="${exclude}" 
-+           debug="${build.debug}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-     	   target="${compiler.target}" source="${compiler.source}"
+           debug="${build.debug}"
-     	   nowarn="${compiler.nowarn}">
+     	   target="${compiler.target}" source="${compiler.source}" 
-       <classpath refid="samples.class.path" />
+     	   nowarn="${compiler.nowarn}">
-     </javac>           
+       <classpath refid="samples.class.path" />
-     <javac srcdir="${samples.dir}/Pipe"  
+     </javac>
-            destdir="${build.samples}"  excludes="${exclude}"
+     <javac srcdir="${samples.dir}/ApplyXPathDOM"  
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+            destdir="${build.samples}" excludes="${exclude}" 
-+           debug="${build.debug}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-     	   nowarn="${compiler.nowarn}">
+           debug="${build.debug}"
-       <classpath refid="samples.class.path" />
+     	   target="${compiler.target}" source="${compiler.source}" 
-     </javac>           
+     	   nowarn="${compiler.nowarn}">
-     <javac srcdir="${samples.dir}/UseXMLFilters"  
+       <classpath refid="samples.class.path" />
-            destdir="${build.samples}"  excludes="${exclude}"
+     </javac>             
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+     <javac srcdir="${samples.dir}/trax"  
-+           debug="${build.debug}"
+            destdir="${build.samples}" excludes="${exclude}" 
-     	   target="${compiler.target}" source="${compiler.source}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-     	   nowarn="${compiler.nowarn}">
+           debug="${build.debug}"
-       <classpath refid="samples.class.path" />
+     	   target="${compiler.target}" source="${compiler.source}" 
-     </javac>           
+     	   nowarn="${compiler.nowarn}">
-     <javac srcdir="${samples.dir}/Trace"   
+       <classpath refid="samples.class.path" />
-            destdir="${build.samples}"  excludes="${exclude}"
+     </javac>           
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+     <javac srcdir="${samples.dir}/extensions"  
-+           debug="${build.debug}"
+            destdir="${build.samples}" excludes="${exclude}" 
-     	   target="${compiler.target}" source="${compiler.source}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-     	   nowarn="${compiler.nowarn}">
+           debug="${build.debug}"
-       <classpath refid="samples.class.path" />
+     	   target="${compiler.target}" source="${compiler.source}" 
-     </javac>           
+     	   nowarn="${compiler.nowarn}">
-     <javac srcdir="${samples.dir}/ApplyXPath"  
+       <classpath refid="samples.class.path" />
-            destdir="${build.samples}" excludes="${exclude}" 
+     </javac>           
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+     <javac srcdir="${samples.dir}/Validate"  
-+           debug="${build.debug}"
+            destdir="${build.samples}" excludes="${exclude}" 
-     	   target="${compiler.target}" source="${compiler.source}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
-     	   nowarn="${compiler.nowarn}">
+           debug="${build.debug}"
-       <classpath refid="samples.class.path" />
+     	   target="${compiler.target}" source="${compiler.source}" 
-     </javac>
+     	   nowarn="${compiler.nowarn}">
-     <javac srcdir="${samples.dir}/ApplyXPathDOM"  
+       <classpath refid="samples.class.path" />
-            destdir="${build.samples}" excludes="${exclude}" 
+     </javac> 
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+     <javac srcdir="${samples.dir}/TransformThread"  
-+           debug="${build.debug}"
+            destdir="${build.samples}" excludes="${exclude}" 
-     	   target="${compiler.target}" source="${compiler.source}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-     	   nowarn="${compiler.nowarn}">
+           debug="${build.debug}"
-       <classpath refid="samples.class.path" />
+     	   target="${compiler.target}" source="${compiler.source}" 
-     </javac>             
+     	   nowarn="${compiler.nowarn}">
-     <javac srcdir="${samples.dir}/trax"  
+       <classpath refid="samples.class.path" />
-            destdir="${build.samples}" excludes="${exclude}" 
+     </javac>
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+     <javac srcdir="${samples.dir}/XPathAPI"  
-+           debug="${build.debug}"
+            destdir="${build.samples}" excludes="${exclude}" 
-     	   target="${compiler.target}" source="${compiler.source}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-     	   nowarn="${compiler.nowarn}">
+           debug="${build.debug}"
-       <classpath refid="samples.class.path" />
+     	   target="${compiler.target}" source="${compiler.source}" 
-     </javac>           
+     	   nowarn="${compiler.nowarn}">
-     <javac srcdir="${samples.dir}/extensions"  
+       <classpath refid="samples.class.path" />
-            destdir="${build.samples}" excludes="${exclude}" 
+@@ -881,7 +882,6 @@ $Id$
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+      <javac srcdir="${samples.dir}/servlet"
-+           debug="${build.debug}"
+             destdir="${build.servlet}/WEB-INF/classes"
-     	   target="${compiler.target}" source="${compiler.source}"
+             debug="${build.debug}"
-     	   nowarn="${compiler.nowarn}">
+-            bootclasspathref="xslt.boot.class.path" 
-       <classpath refid="samples.class.path" />
+      	    target="${compiler.target}" source="${compiler.source}" 
-     </javac>           
+      	    nowarn="${compiler.nowarn}">
-     <javac srcdir="${samples.dir}/Validate"  
+         <classpath refid="samples.class.path" />
-            destdir="${build.samples}" excludes="${exclude}" 
+@@ -924,12 +924,12 @@ $Id$
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
+     <javac srcdir="${samples.dir}/translets"
-+           debug="${build.debug}"
+            classpath="${build.xalan.jar}" 
-     	   target="${compiler.target}" source="${compiler.source}"
+            destdir="${build.samples}" excludes="${exclude}" 
-     	   nowarn="${compiler.nowarn}">
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-       <classpath refid="samples.class.path" />
+           debug="${build.debug}" 
-     </javac> 
+   	       target="${compiler.target}" source="${compiler.source}" 
-     <javac srcdir="${samples.dir}/TransformThread"  
+     	   nowarn="${compiler.nowarn}"/>
-            destdir="${build.samples}" excludes="${exclude}" 
+     <javac srcdir="${samples.dir}/CompiledJAXP"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+            destdir="${build.samples}" excludes="${exclude}"
-+           debug="${build.debug}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-     	   target="${compiler.target}" source="${compiler.source}"
+           debug="${build.debug}" 
-     	   nowarn="${compiler.nowarn}">
+   	       target="${compiler.target}" source="${compiler.source}" 
-       <classpath refid="samples.class.path" />
+     	   nowarn="${compiler.nowarn}"/>
-     </javac>
+   </target>
-     <javac srcdir="${samples.dir}/XPathAPI"  
+@@ -943,7 +943,7 @@ $Id$
-            destdir="${build.samples}" excludes="${exclude}" 
+     <mkdir dir="${build.samples}/CompiledApplet"/>
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+     <javac srcdir="${samples.dir}/CompiledApplet"
-+           debug="${build.debug}"
+            destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
-     	   target="${compiler.target}" source="${compiler.source}"
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-     	   nowarn="${compiler.nowarn}">
+           debug="${build.debug}"
-       <classpath refid="samples.class.path" />
+     	   target="${compiler.target}" source="${compiler.source}" 
-@@ -889,7 +886,6 @@
+     	   nowarn="${compiler.nowarn}"/>
-      <javac srcdir="${samples.dir}/servlet"
+     <jar jarfile="${build.xsltc.applet.jar}"
-             destdir="${build.servlet}/WEB-INF/classes"
+@@ -960,7 +960,7 @@ $Id$
-             debug="${build.debug}"
+     <mkdir dir="${build.samples}/CompiledBrazil"/>
-            bootclasspathref="xslt.boot.class.path" 
+     <javac srcdir="${samples.dir}/CompiledBrazil"
-      	    target="${compiler.target}" source="${compiler.source}"
+            destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
-      	    nowarn="${compiler.nowarn}">
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-         <classpath refid="samples.class.path" />
+           debug="${build.debug}"
-@@ -930,14 +926,14 @@
+     	   target="${compiler.target}" source="${compiler.source}" 
-   <target name="xsltc.samples.nojardepends">
+     	   nowarn="${compiler.nowarn}">
-     <mkdir dir="${build.samples}"/>
+     	<classpath location="${brazil.jar}"/>
-     <javac srcdir="${samples.dir}/translets"
+@@ -981,7 +981,7 @@ $Id$
-           classpath="${java.class.path}:${build.xalan.jar}" 
+     <mkdir dir="${build.samples}/CompiledEJB"/>
-+           classpath="${build.xalan.jar}" 
+     <javac srcdir="${samples.dir}/CompiledEJB"
-            destdir="${build.samples}" excludes="${exclude}" 
+            destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-+           debug="${build.debug}" 
+           debug="${build.debug}"
-   	       target="${compiler.target}" source="${compiler.source}"
+     	   target="${compiler.target}" source="${compiler.source}" 
-   	       nowarn="${compiler.nowarn}"/>
+     	   nowarn="${compiler.nowarn}">
-     <javac srcdir="${samples.dir}/CompiledJAXP"
+     	<classpath location="${javaee-api.jar}"/>
-            destdir="${build.samples}" excludes="${exclude}"
+@@ -1000,7 +1000,7 @@ $Id$
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+     <mkdir dir="${build.samples}/CompiledServlet"/>
-+           debug="${build.debug}"
+     <javac srcdir="${samples.dir}/CompiledServlet"
-   	       target="${compiler.target}" source="${compiler.source}"
+            destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
-   	       nowarn="${compiler.nowarn}"/>
+-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
-   </target>
+           debug="${build.debug}"
-@@ -951,7 +947,7 @@
+     	   target="${compiler.target}" source="${compiler.source}" 
-     <mkdir dir="${build.samples}/CompiledApplet"/>
+     	   classpath="${build.xalan.jar}:${servlet-api.jar}" 
-     <javac srcdir="${samples.dir}/CompiledApplet"
+     	   nowarn="${compiler.nowarn}">
-            destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
+@@ -1760,7 +1760,6 @@ $Id$
-           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
+     	   nowarn="${compiler.nowarn}">
-+           debug="${build.debug}"
+       <include name="${serializer.reldir}/**/*.java" />
-     	   target="${compiler.target}" source="${compiler.source}"
+       <classpath refid="compile.class.path" />
-   	       nowarn="${compiler.nowarn}"/>
+-      <bootclasspath refid="xslt.boot.class.path" />
-     <jar jarfile="${build.xsltc.applet.jar}"
+     </javac>
-@@ -968,7 +964,7 @@
+     <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
-     <mkdir dir="${build.samples}/CompiledBrazil"/>
+     <copy todir="${serializer.build.classes}">
     <javac srcdir="${samples.dir}/CompiledBrazil"
            destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}"
     	   nowarn="${compiler.nowarn}">
     	<classpath location="${brazil.jar}"/>
@@ -989,7 +985,7 @@
     <mkdir dir="${build.samples}/CompiledEJB"/>
     <javac srcdir="${samples.dir}/CompiledEJB"
            destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}"
     	   nowarn="${compiler.nowarn}">
     	<classpath location="${javaee-api.jar}"/>
@@ -1008,7 +1004,7 @@
     <mkdir dir="${build.samples}/CompiledServlet"/>
     <javac srcdir="${samples.dir}/CompiledServlet"
            destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}"
     	   target="${compiler.target}" source="${compiler.source}" 
     	   classpath="${build.xalan.jar}:${servlet-api.jar}"
     	   nowarn="${compiler.nowarn}">
@@ -1627,7 +1623,7 @@
     <!-- Use FOP to generate a pdf file (classpath may need updating! -sc 18-Apr-01)-->
     <java fork="yes" 
           classname="org.apache.fop.apps.CommandLine"
 -      classpath="${java.class.path}:${build.xalan.jar}:${bin.dir}/fop.jar:${bin.dir}/w3c.jar">
 +      classpath="${build.xalan.jar}:${bin.dir}/fop.jar:${bin.dir}/w3c.jar">
       <arg line="${build.docs}/xalan-collate.fo build/docs/xalan.pdf"/>
     </java>
   </target>
@@ -1764,7 +1760,6 @@
     	   nowarn="${compiler.nowarn}">
       <include name="${serializer.reldir}/**/*.java" />
       <classpath refid="compile.class.path" />
 -      <bootclasspath refid="xslt.boot.class.path" />
     </javac>
     <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
     <copy todir="${serializer.build.classes}">
 Only in xalan-j_2_7_3: build.xml.orig
 Only in xalan-j_2_7_3: build.xml.rej
--- a/xalan-j2-2.7.3.tar.xz
+++ b/xalan-j2-2.7.3.tar.xz
--- 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
+diff --git a/build.xml b/build.xml
--- xalan-j_2_7_2.old/build.xml	2014-06-23 09:21:30.815410307 +0200
+index df58558..2a2703a 100644
-+++ xalan-j_2_7_2/build.xml	2014-06-23 09:22:59.124418473 +0200
+--- a/build.xml
-@@ -204,7 +204,9 @@
+++ b/build.xml
-   <property name="serializer.jar.name"          value="serializer.jar"/>   
+@@ -205,7 +205,9 @@ $Id$
-   <property name="build.serializer.jar"         value="${serializer.build.dir}/${serializer.jar.name}"/> 
+   <property name="serializer.jar.name"          value="serializer.jar"/>   
-   <property name="lib.serializer.jar"           value="./lib/${serializer.jar.name}"/>   
+   <property name="build.serializer.jar"         value="${serializer.build.dir}/${serializer.jar.name}"/> 
- 
+   <property name="lib.serializer.jar"           value="./lib/${serializer.jar.name}"/>   
-+
+- 
-+  <property name="api.j2se" value="http://java.sun.com/j2se/1.4/docs/api/"/>
+
-+
+  <property name="api.j2se" value="http://java.sun.com/j2se/1.4/docs/api/"/>
-   <!-- Class paths used in various targets -->
+
-   <path id="docs.class.path">
+   <!-- Class paths used in various targets -->
-     <pathelement location="${xmlapis.jar}" />
+   <path id="docs.class.path">
-@@ -1098,6 +1100,7 @@
+     <pathelement location="${xmlapis.jar}" />
-           <group title="DOM 2" packages="org.w3c.dom*"/>
+@@ -1120,6 +1122,7 @@ $Id$
-           <group title="XSLTC Core"
+           <group title="DOM 2" packages="org.w3c.dom*"/>
-                  packages="org.apache.xalan.xsltc*"/>
+           <group title="XSLTC Core"
-+          <link href="${api.j2se}"/>
+                  packages="org.apache.xalan.xsltc*"/>
-     </javadoc>
+          <link href="${api.j2se}"/>
-   </target>
+     </javadoc>
- 
+   </target>
-@@ -1133,6 +1136,7 @@
+ 
-           <group title="DOM 2" packages="org.w3c.dom*"/>
+@@ -1155,6 +1158,7 @@ $Id$
-           <group title="XSLTC Core"
+           <group title="DOM 2" packages="org.w3c.dom*"/>
-                  packages="org.apache.xalan.xsltc*"/>
+           <group title="XSLTC Core"
-+          <link href="${api.j2se}"/>
+                  packages="org.apache.xalan.xsltc*"/>
-     </javadoc>
+          <link href="${api.j2se}"/>
-   </target>
+     </javadoc>
- 
+   </target>
--- 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
+diff --git a/src/MANIFEST.MF b/src/MANIFEST.MF
--- xalan-j_2_7_3.orig/src/MANIFEST.MF	2023-08-30 18:36:44.211105060 +0200
+index 15a12ae..43c7c3b 100644
-+++ xalan-j_2_7_3/src/MANIFEST.MF	2023-08-30 18:39:12.542098631 +0200
+--- a/src/MANIFEST.MF
 +++ b/src/MANIFEST.MF
@@ -1,7 +1,6 @@
- Manifest-Version: 1.0
+ Manifest-Version: 1.0
- Created-By: @java.version@ (@java.vendor@)
+ Created-By: @java.version@ (@java.vendor@)
- Main-Class: org.apache.xalan.xslt.Process
+ Main-Class: org.apache.xalan.xslt.Process
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
+-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
- 
+ 
- 
+ 
- Name: org/apache/xalan/
+ Name: org/apache/xalan/
-@@ -38,33 +37,3 @@
+@@ -38,33 +37,3 @@ Implementation-Version: @impl.version@
- Implementation-Vendor: Apache Software Foundation
+ Implementation-Vendor: Apache Software Foundation
- Implementation-URL: https://xalan.apache.org/xalan-j/
+ Implementation-URL: https://xalan.apache.org/xalan-j/
- 
+ 
-Name: java_cup/runtime/ 
+-Name: java_cup/runtime/ 
-Comment: Runtime component of JCup 
+-Comment: Runtime component of JCup 
-Specification-Title: Runtime component of JCup
+-Specification-Title: Runtime component of JCup
-Specification-Vendor: Princeton University 
+-Specification-Vendor: Princeton University 
-Specification-Version: 0.10k 
+-Specification-Version: 0.10k 
-Implementation-Title: runtime 
+-Implementation-Title: runtime 
-Implementation-Version: @impl.version@
+-Implementation-Version: @impl.version@
-Implementation-Vendor: Princeton University  
+-Implementation-Vendor: Princeton University  
-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/ 
+-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/ 
-
+-
-Name: org/apache/bcel/
+-Name: org/apache/bcel/
-Comment: Apache Commons Byte Code Engineering Library
+-Comment: Apache Commons Byte Code Engineering Library
-Specification-Title: Apache Commons BCEL
+-Specification-Title: Apache Commons BCEL
-Specification-Vendor: Apache Software Foundation
+-Specification-Vendor: Apache Software Foundation
-Specification-Version: 6.7.0
+-Specification-Version: 6.7.0
-Implementation-Title: org.apache.bcel
+-Implementation-Title: org.apache.bcel
-Implementation-Version: @impl.version@
+-Implementation-Version: @impl.version@
-Implementation-Vendor: Apache Software Foundation
+-Implementation-Vendor: Apache Software Foundation
-Implementation-URL: https://commons.apache.org/proper/commons-bcel
+-Implementation-URL: https://commons.apache.org/proper/commons-bcel
-
+-
-Name: org/apache/regexp/
+-Name: org/apache/regexp/
-Comment: Java Regular Expression package 
+-Comment: Java Regular Expression package 
-Specification-Title: Java Regular Expression package 
+-Specification-Title: Java Regular Expression package 
-Specification-Vendor: Apache Software Foundation 
+-Specification-Vendor: Apache Software Foundation 
-Specification-Version: 1.2
+-Specification-Version: 1.2
-Implementation-Title: org.apache.regexp
+-Implementation-Title: org.apache.regexp
-Implementation-Version: @impl.version@
+-Implementation-Version: @impl.version@
-Implementation-Vendor: Apache Software Foundation
+-Implementation-Vendor: Apache Software Foundation
-Implementation-URL: http://jakarta.apache.org/regexp
+-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
+diff --git a/src/MANIFEST.SERIALIZER b/src/MANIFEST.SERIALIZER
--- xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER	2023-08-30 18:36:44.211105060 +0200
+index 54be291..4bc1c11 100644
-+++ xalan-j_2_7_3/src/MANIFEST.SERIALIZER	2023-08-30 18:38:46.375256700 +0200
+--- a/src/MANIFEST.SERIALIZER
 +++ b/src/MANIFEST.SERIALIZER
@@ -1,7 +1,6 @@
- Manifest-Version: 1.0
+ Manifest-Version: 1.0
- Created-By: @java.version@ (@java.vendor@)
+ Created-By: @java.version@ (@java.vendor@)
- Main-Class: org.apache.xml.serializer.Version
+ Main-Class: org.apache.xml.serializer.Version
-Class-Path: xml-apis.jar
+-Class-Path: xml-apis.jar
- 
+ 
- Name: org/apache/xml/serializer/
+ 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.
+ 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
+diff --git a/src/manifest.xalan-interpretive b/src/manifest.xalan-interpretive
--- xalan-j_2_7_3.orig/src/manifest.xalan-interpretive	2023-08-30 18:36:44.211105060 +0200
+index fd5882a..f1c895e 100644
-+++ xalan-j_2_7_3/src/manifest.xalan-interpretive	2023-08-30 18:38:46.375256700 +0200
+--- a/src/manifest.xalan-interpretive
 +++ b/src/manifest.xalan-interpretive
@@ -1,7 +1,6 @@
- Manifest-Version: 1.0
+ Manifest-Version: 1.0
- Created-By: @java.version@ (@java.vendor@)
+ Created-By: @java.version@ (@java.vendor@)
- Main-Class: org.apache.xalan.xslt.Process
+ Main-Class: org.apache.xalan.xslt.Process
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
+-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
- 
+ 
- Name: org/apache/xalan/
+ Name: org/apache/xalan/
- Comment: Main Xalan engine implementing TrAX/JAXP
+ 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
+diff --git a/src/manifest.xsltc b/src/manifest.xsltc
--- xalan-j_2_7_3.orig/src/manifest.xsltc	2023-08-30 18:36:44.211105060 +0200
+index fd24887..2c99f38 100644
-+++ xalan-j_2_7_3/src/manifest.xsltc	2023-08-30 18:39:52.469032707 +0200
+--- a/src/manifest.xsltc
 +++ b/src/manifest.xsltc
@@ -1,6 +1,5 @@
- Manifest-Version: 1.0
+ Manifest-Version: 1.0
- Created-By: @java.version@ (@java.vendor@)
+ Created-By: @java.version@ (@java.vendor@)
-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
+-Class-Path: xercesImpl.jar xml-apis.jar serializer.jar
- 
+ 
- Name: org/apache/xalan/xsltc/
+ Name: org/apache/xalan/xsltc/
- Comment: Main XSLTC engine implementing TrAX/JAXP
+ Comment: Main XSLTC engine implementing TrAX/JAXP
-@@ -19,33 +18,3 @@
+@@ -19,33 +18,3 @@ Implementation-Version: @impl.version@
- Implementation-Vendor: Apache Software Foundation
+ Implementation-Vendor: Apache Software Foundation
- Implementation-URL: http://xml.apache.org/xalan-j/dist/
+ Implementation-URL: http://xml.apache.org/xalan-j/dist/
- 
+ 
-Name: java_cup/runtime/
+-Name: java_cup/runtime/
-Comment: Runtime component of JCup 
+-Comment: Runtime component of JCup 
-Specification-Title: Runtime component of JCup
+-Specification-Title: Runtime component of JCup
-Specification-Vendor: Princeton University 
+-Specification-Vendor: Princeton University 
-Specification-Version: 0.10k 
+-Specification-Version: 0.10k 
-Implementation-Title: runtime 
+-Implementation-Title: runtime 
-Implementation-Version: @impl.version@
+-Implementation-Version: @impl.version@
-Implementation-Vendor: Princeton University  
+-Implementation-Vendor: Princeton University  
-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/ 
+-Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/ 
-
+-
-Name: org/apache/bcel/
+-Name: org/apache/bcel/
-Comment: Byte Code Engineering Library 
+-Comment: Byte Code Engineering Library 
-Specification-Title: Byte Code Engineering Library 
+-Specification-Title: Byte Code Engineering Library 
-Specification-Vendor: Markus Dahm 
+-Specification-Vendor: Markus Dahm 
-Specification-Version: 6.6.0
+-Specification-Version: 6.6.0
-Implementation-Title: org.apache.bcel
+-Implementation-Title: org.apache.bcel
-Implementation-Version: @impl.version@
+-Implementation-Version: @impl.version@
-Implementation-Vendor: Apache Software Foundation
+-Implementation-Vendor: Apache Software Foundation
-Implementation-URL: http://jakarta.apache.org/bcel
+-Implementation-URL: http://jakarta.apache.org/bcel
-
+-
-Name: org/apache/regexp/
+-Name: org/apache/regexp/
-Comment: Java Regular Expression package 
+-Comment: Java Regular Expression package 
-Specification-Title: Java Regular Expression package 
+-Specification-Title: Java Regular Expression package 
-Specification-Vendor: Apache Software Foundation 
+-Specification-Vendor: Apache Software Foundation 
-Specification-Version: 1.2
+-Specification-Version: 1.2
-Implementation-Title: org.apache.regexp
+-Implementation-Title: org.apache.regexp
-Implementation-Version: @impl.version@
+-Implementation-Version: @impl.version@
-Implementation-Vendor: Apache Software Foundation
+-Implementation-Vendor: Apache Software Foundation
-Implementation-URL: http://jakarta.apache.org/regexp
+-Implementation-URL: http://jakarta.apache.org/regexp
-
+-
--- 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
+diff --git a/build.xml b/build.xml
--- xalan-j_2_7_2.old/build.xml	2014-06-23 09:21:30.815410307 +0200
+index 55c7d38..df58558 100644
-+++ xalan-j_2_7_2/build.xml	2014-06-23 09:25:00.547429701 +0200
+--- a/build.xml
-@@ -616,7 +616,7 @@
+++ b/build.xml
-   <!-- =================================================================== -->
+@@ -616,7 +616,7 @@ $Id$
-   <!-- Creates the xsltc jar including all support jars                    -->
+   <!-- =================================================================== -->
-   <!-- =================================================================== -->
+   <!-- Creates the xsltc jar including all support jars                    -->
-  <target name="xsltc.jar" depends="xsltc.compile,xsltc.copy-deps-jars"
+   <!-- =================================================================== -->
-+  <target name="xsltc.jar" depends="xsltc.compile"
+-  <target name="xsltc.jar" depends="xsltc.compile,xsltc.copy-deps-jars"
-      description="Jar xsltc,xml,BCEL,JLex,java_cup,runtime and jakarta regexp">
+  <target name="xsltc.jar" depends="xsltc.compile"
- 
+      description="Jar xsltc,xml,BCEL,JLex,java_cup,runtime and jakarta regexp">
-     <!-- create new META-INF dir w/ transformer factory default -->
+ 
     <!-- create new META-INF dir w/ transformer factory default -->
--- a/xalan-j2.changes
+++ b/xalan-j2.changes
@@ -1,3 +1,28 @@
 -------------------------------------------------------------------
 Fri Sep  5 06:55:25 UTC 2025 - Fridrich Strba <fstrba@suse.com>
 - Do not require the jaxp_parser_impl, but xerces-j2 directly
 -------------------------------------------------------------------
 Fri Sep  5 06:23:04 UTC 2025 - Fridrich Strba <fstrba@suse.com>
 - Do not provide the jaxp_transform_impl alternative (bsc#1245931)
 -------------------------------------------------------------------
 Sun Sep 22 07:00:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 - 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:
  * openjdk-build.patch
  * 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 <fstrba@suse.com>
--- a/xalan-j2.spec
+++ b/xalan-j2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xalan-j2
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,48 +16,63 @@
 #
 %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
 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
 Source4:        xalan-j2-serializer-MANIFEST.MF
 Source5:        xalan-j2-MANIFEST.MF
 # OSGi manifests
-Patch0:         %{name}-noxsltcdeps.patch
+Patch0:         %{base_name}-noxsltcdeps.patch
-Patch1:         %{name}-manifest.patch
+Patch1:         %{base_name}-manifest.patch
-Patch2:         %{name}-crosslink.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
 #!BuildIgnore:  xml-commons-resolver
-Requires:       jaxp_parser_impl
+Requires:       xerces-j2
 Requires(post): update-alternatives
 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
 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,24 +81,24 @@ 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
 Requires:       java_cup
 Requires:       jaxp_parser_impl
 Requires:       jlex
 Requires:       regexp
 Requires:       xerces-j2
-%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 +107,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
@@ -108,113 +123,130 @@ 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, 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
 %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
 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 stylebook) stylebook-1.0-b3_xalan-2.jar
+ln -sf $(build-classpath xml-stylebook) stylebook-1.0-b3_xalan-2.jar
 %endif
 popd
 %if %{with extras}
 mkdir -p build
 pushd build
 ln -sf $(build-classpath %{base_name}) 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}
  -Dservlet-api.jar=$(build-classpath servletapi5) \
  xsltc.unbundledjar \
  docs \
  xsltc.docs \
  samples \
  servlet
 %else
  xalan-interpretive.jar
 # inject OSGi manifests
-jar ufm build/serializer.jar %{SOURCE4}
+jar \
-jar ufm build/xalan-interpretive.jar %{SOURCE5}
+%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}
 %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 \
+%endif
  %{buildroot}%{_javadir}/%{name}-serializer.jar
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
+%if %{without extras}
-%add_maven_depmap %{name}.pom %{name}.jar
+%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{base_name}.pom
-%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}-serializer.pom
+%add_maven_depmap %{base_name}.pom %{base_name}.jar
-%add_maven_depmap %{name}-serializer.pom %{name}-serializer.jar
+%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{base_name}-serializer.pom
-%{mvn_install_pom} %{SOURCE3}  %{buildroot}%{_mavenpomdir}/xsltc.pom
+%add_maven_depmap %{base_name}-serializer.pom %{base_name}-serializer.jar
 %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
+%else
-update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
+%{mvn_install_pom} %{SOURCE3}  %{buildroot}%{_mavenpomdir}/xsltc.pom
-  jaxp_transform_impl %{_javadir}/%{name}.jar 30
+%add_maven_depmap xsltc.pom xsltc.jar -f xsltc
-%preun
+# demo
-{
+install -d -m 755 %{buildroot}%{_datadir}/%{base_name}
-  [ $1 = 0 ] || exit 0
+install -p -m 644 build/xalansamples.jar \
-  update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
+  %{buildroot}%{_datadir}/%{base_name}/%{base_name}-samples.jar
-} >/dev/null 2>&1 || :
+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}
 %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
+%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
--- a/xalan-j_2_7_3-src.tar.gz
+++ b/xalan-j_2_7_3-src.tar.gz
Author	SHA256	Message	Date
Fridrich Štrba	aa8596f7b6	don't require update-alteantives	2025-09-05 09:32:03 +02:00
Fridrich Štrba	b93f4792e0	Do not require the jaxp_parser_impl, but xerces-j2 directly	2025-09-05 08:57:02 +02:00
Fridrich Štrba	a6600e2c1d	bsc#12459312	2025-09-05 08:24:19 +02:00
Ana Guerrero	f226e8b382	Accepting request 1202691 from Java:packages reproducible build + packaging overhaul OBS-URL: https://build.opensuse.org/request/show/1202691 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xalan-j2?expand=0&rev=33	2024-09-24 15:31:25 +00:00
Fridrich Strba	b653153dee	OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=55	2024-09-23 14:46:18 +00:00
Fridrich Strba	23abe9dbc4	OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=54	2024-09-23 14:45:49 +00:00
Fridrich Strba	17b735a83e	OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=53	2024-09-22 18:41:39 +00:00
Fridrich Strba	535aa0dcdf	OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=52	2024-09-22 14:45:21 +00:00
Fridrich Strba	02e165eec6	OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=51	2024-09-22 13:50:01 +00:00
Fridrich Strba	08df65207a	OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=50	2024-09-22 10:16:56 +00:00
Fridrich Strba	e2acb06a66	OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=49	2024-09-22 10:12:27 +00:00
Fridrich Strba	e6c1f630b2	OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=48	2024-09-22 10:04:30 +00:00
Fridrich Strba	d5876cd479	OBS-URL: https://build.opensuse.org/package/show/Java:packages/xalan-j2?expand=0&rev=47	2024-09-22 07:00:32 +00:00