Sync from SUSE:SLFO:1.1 xalan-j2 revision d7120dd9cb1b3dbd6b64d32f3aff3f78

_multibuild

@@ -1,3 +0,0 @@
-<multibuild>
-  <package>extras</package>
-</multibuild>

_service

@@ -1,18 +0,0 @@
-<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>

openjdk-build.patch

@@ -1,8 +1,30 @@
-diff --git a/build.xml b/build.xml
+diff -urEbwB xalan-j_2_7_3.orig/build.xml xalan-j_2_7_3/build.xml
-index 2a2703a..20fe6e4 100644
+--- xalan-j_2_7_3.orig/build.xml	2023-08-30 18:36:44.177771503 +0200
---- a/build.xml
++++ xalan-j_2_7_3/build.xml	2023-08-30 18:49:32.266249508 +0200
-+++ b/build.xml
+@@ -221,14 +221,12 @@
-@@ -391,7 +391,6 @@ $Id$
+     <pathelement location="${taglet.jar}" />
+     <pathelement location="${build.serializer.jar}" />
+     <pathelement location="${build.xalan.jar}" />
+-    <pathelement path="${java.class.path}" />
+   </path>
+   <path id="samples.class.path">
+     <pathelement location="${xmlapis.jar}" />
+     <pathelement location="${build.serializer.jar}" />    
+     <pathelement location="${parser.jar}" />  
+     <pathelement location="${build.xalan.jar}" />
+-    <pathelement path="${java.class.path}" />
+   </path>
+   <path id="compile.class.path">
+     <!-- Ensure the selected parser.jar file is used to compile against -->
+@@ -237,7 +235,6 @@
+     <pathelement location="${xmlapis.jar}" />
+     <pathelement location="${build.serializer.jar}" />
+     <pathelement location="${parser.jar}" />
+-    <pathelement path="${java.class.path}" />
+   </path>
+ 	
+   <path id="xslt.boot.class.path">
+@@ -398,7 +395,6 @@
        <exclude name="**/IncrementalSAXSource_Xerces.java" 
          unless="xerces.present"	 />
        <classpath refid="compile.class.path" />
@@ -10,7 +32,7 @@ index 2a2703a..20fe6e4 100644
      </javac>
      <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
      <copy todir="${build.classes}">
-@@ -407,6 +406,12 @@ $Id$
+@@ -414,6 +410,12 @@
    <!-- =================================================================== -->
    <target name="xalan-interpretive.compile" depends="xml.compile"
      description="Compile the Xalan interpretive classes (skips XSLTC)" >
@@ -23,7 +45,7 @@ index 2a2703a..20fe6e4 100644
      <echo message="Compiling Xalan interpretive classes" />
      <javac srcdir="${src.dir}" 
             destdir="${build.classes}"
-@@ -418,7 +423,6 @@ $Id$
+@@ -425,7 +427,6 @@
        <include name="${xalan.reldir}/**/*.java" />
        <exclude name="${xsltc.reldir}/**/*.java" />
        <classpath refid="compile.class.path" />
@@ -31,7 +53,15 @@ index 2a2703a..20fe6e4 100644
        <sourcepath refid="compile.source.path" />
      </javac>
      <!-- Copy needed properties, resource, etc. files to be put into .jar file -->
-@@ -461,7 +465,6 @@ $Id$
+@@ -454,7 +455,6 @@
+     <!-- build.classes needed for 
+          org.apache.xalan.xsltc.util.JavaCupRedirect -->
+     <pathelement location="${build.classes}" />
+-    <pathelement path="${java.class.path}" />
+   </path>
+ 
+   <!-- Attempt to determine dependency info for generated sources -->
+@@ -469,7 +469,6 @@
      	   target="${compiler.target}" source="${compiler.source}"
      	   nowarn="${compiler.nowarn}">
        <classpath refid="xsltc.class.path" />
@@ -39,7 +69,7 @@ index 2a2703a..20fe6e4 100644
      </javac>
      <!-- These tricky uptodate statements hopefully determine if we 
           actually need to generate the java_cup and jlex files 
-@@ -526,7 +529,6 @@ $Id$
+@@ -534,7 +533,6 @@
      	   target="${compiler.target}" source="${compiler.source}"
      	   nowarn="${compiler.nowarn}"> 
        <classpath refid="xsltc.class.path" />
@@ -47,7 +77,7 @@ index 2a2703a..20fe6e4 100644
      </javac>
    </target>
  
-@@ -541,7 +543,6 @@ $Id$
+@@ -549,7 +547,6 @@
      	   target="${compiler.target}" source="${compiler.source}"
      	   nowarn="${compiler.nowarn}">
        <classpath refid="xsltc.class.path" />
@@ -55,7 +85,7 @@ index 2a2703a..20fe6e4 100644
      </javac>
    </target>
  
-@@ -740,104 +741,104 @@ $Id$
+@@ -748,104 +745,104 @@
      <!-- Since the samples are packageless, they must be compiled separately. -->   
      <javac srcdir="${samples.dir}/SimpleTransform" 
             destdir="${build.samples}"  excludes="${exclude}"
@@ -175,7 +205,7 @@ index 2a2703a..20fe6e4 100644
      	   target="${compiler.target}" source="${compiler.source}"
      	   nowarn="${compiler.nowarn}">
        <classpath refid="samples.class.path" />
-@@ -881,7 +882,6 @@ $Id$
+@@ -889,7 +886,6 @@
       <javac srcdir="${samples.dir}/servlet"
              destdir="${build.servlet}/WEB-INF/classes"
              debug="${build.debug}"
@@ -183,9 +213,12 @@ index 2a2703a..20fe6e4 100644
       	    target="${compiler.target}" source="${compiler.source}"
       	    nowarn="${compiler.nowarn}">
          <classpath refid="samples.class.path" />
-@@ -924,12 +924,12 @@ $Id$
+@@ -930,14 +926,14 @@
+   <target name="xsltc.samples.nojardepends">
+     <mkdir dir="${build.samples}"/>
      <javac srcdir="${samples.dir}/translets"
-            classpath="${build.xalan.jar}" 
+-           classpath="${java.class.path}:${build.xalan.jar}" 
++           classpath="${build.xalan.jar}" 
             destdir="${build.samples}" excludes="${exclude}" 
 -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" 
 +           debug="${build.debug}" 
@@ -198,7 +231,7 @@ index 2a2703a..20fe6e4 100644
    	       target="${compiler.target}" source="${compiler.source}"
    	       nowarn="${compiler.nowarn}"/>
    </target>
-@@ -943,7 +943,7 @@ $Id$
+@@ -951,7 +947,7 @@
      <mkdir dir="${build.samples}/CompiledApplet"/>
      <javac srcdir="${samples.dir}/CompiledApplet"
             destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
@@ -207,7 +240,7 @@ index 2a2703a..20fe6e4 100644
      	   target="${compiler.target}" source="${compiler.source}"
    	       nowarn="${compiler.nowarn}"/>
      <jar jarfile="${build.xsltc.applet.jar}"
-@@ -960,7 +960,7 @@ $Id$
+@@ -968,7 +964,7 @@
      <mkdir dir="${build.samples}/CompiledBrazil"/>
      <javac srcdir="${samples.dir}/CompiledBrazil"
             destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
@@ -216,7 +249,7 @@ index 2a2703a..20fe6e4 100644
      	   target="${compiler.target}" source="${compiler.source}"
      	   nowarn="${compiler.nowarn}">
      	<classpath location="${brazil.jar}"/>
-@@ -981,7 +981,7 @@ $Id$
+@@ -989,7 +985,7 @@
      <mkdir dir="${build.samples}/CompiledEJB"/>
      <javac srcdir="${samples.dir}/CompiledEJB"
             destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
@@ -225,7 +258,7 @@ index 2a2703a..20fe6e4 100644
      	   target="${compiler.target}" source="${compiler.source}"
      	   nowarn="${compiler.nowarn}">
      	<classpath location="${javaee-api.jar}"/>
-@@ -1000,7 +1000,7 @@ $Id$
+@@ -1008,7 +1004,7 @@
      <mkdir dir="${build.samples}/CompiledServlet"/>
      <javac srcdir="${samples.dir}/CompiledServlet"
             destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
@@ -234,7 +267,16 @@ index 2a2703a..20fe6e4 100644
      	   target="${compiler.target}" source="${compiler.source}" 
      	   classpath="${build.xalan.jar}:${servlet-api.jar}"
      	   nowarn="${compiler.nowarn}">
-@@ -1760,7 +1760,6 @@ $Id$
+@@ -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" />
@@ -242,3 +284,5 @@ index 2a2703a..20fe6e4 100644
      </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

xalan-j2-crosslink.patch

@@ -1,8 +1,7 @@
-diff --git a/build.xml b/build.xml
+diff -urN xalan-j_2_7_2.old/build.xml xalan-j_2_7_2/build.xml
-index df58558..2a2703a 100644
+--- xalan-j_2_7_2.old/build.xml	2014-06-23 09:21:30.815410307 +0200
---- a/build.xml
++++ xalan-j_2_7_2/build.xml	2014-06-23 09:22:59.124418473 +0200
-+++ b/build.xml
+@@ -204,7 +204,9 @@
-@@ -205,7 +205,9 @@ $Id$
    <property name="serializer.jar.name"          value="serializer.jar"/>   
    <property name="build.serializer.jar"         value="${serializer.build.dir}/${serializer.jar.name}"/> 
    <property name="lib.serializer.jar"           value="./lib/${serializer.jar.name}"/>   
@@ -13,7 +12,7 @@ index df58558..2a2703a 100644
    <!-- Class paths used in various targets -->
    <path id="docs.class.path">
      <pathelement location="${xmlapis.jar}" />
-@@ -1120,6 +1122,7 @@ $Id$
+@@ -1098,6 +1100,7 @@
            <group title="DOM 2" packages="org.w3c.dom*"/>
            <group title="XSLTC Core"
                   packages="org.apache.xalan.xsltc*"/>
@@ -21,7 +20,7 @@ index df58558..2a2703a 100644
      </javadoc>
    </target>
  
-@@ -1155,6 +1158,7 @@ $Id$
+@@ -1133,6 +1136,7 @@
            <group title="DOM 2" packages="org.w3c.dom*"/>
            <group title="XSLTC Core"
                   packages="org.apache.xalan.xsltc*"/>

xalan-j2-manifest.patch

@@ -1,7 +1,6 @@
-diff --git a/src/MANIFEST.MF b/src/MANIFEST.MF
+diff -urEbwB xalan-j_2_7_3.orig/src/MANIFEST.MF xalan-j_2_7_3/src/MANIFEST.MF
-index 15a12ae..43c7c3b 100644
+--- xalan-j_2_7_3.orig/src/MANIFEST.MF	2023-08-30 18:36:44.211105060 +0200
---- a/src/MANIFEST.MF
++++ xalan-j_2_7_3/src/MANIFEST.MF	2023-08-30 18:39:12.542098631 +0200
-+++ b/src/MANIFEST.MF
 @@ -1,7 +1,6 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)
@@ -10,7 +9,7 @@ index 15a12ae..43c7c3b 100644
  
  
  Name: org/apache/xalan/
-@@ -38,33 +37,3 @@ Implementation-Version: @impl.version@
+@@ -38,33 +37,3 @@
  Implementation-Vendor: Apache Software Foundation
  Implementation-URL: https://xalan.apache.org/xalan-j/
  
@@ -44,10 +43,9 @@ index 15a12ae..43c7c3b 100644
 -Implementation-Vendor: Apache Software Foundation
 -Implementation-URL: http://jakarta.apache.org/regexp
 -
-diff --git a/src/MANIFEST.SERIALIZER b/src/MANIFEST.SERIALIZER
+diff -urEbwB xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER xalan-j_2_7_3/src/MANIFEST.SERIALIZER
-index 54be291..4bc1c11 100644
+--- xalan-j_2_7_3.orig/src/MANIFEST.SERIALIZER	2023-08-30 18:36:44.211105060 +0200
---- a/src/MANIFEST.SERIALIZER
++++ xalan-j_2_7_3/src/MANIFEST.SERIALIZER	2023-08-30 18:38:46.375256700 +0200
-+++ b/src/MANIFEST.SERIALIZER
 @@ -1,7 +1,6 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)
@@ -56,10 +54,9 @@ index 54be291..4bc1c11 100644
  
  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
+diff -urEbwB xalan-j_2_7_3.orig/src/manifest.xalan-interpretive xalan-j_2_7_3/src/manifest.xalan-interpretive
-index fd5882a..f1c895e 100644
+--- xalan-j_2_7_3.orig/src/manifest.xalan-interpretive	2023-08-30 18:36:44.211105060 +0200
---- a/src/manifest.xalan-interpretive
++++ xalan-j_2_7_3/src/manifest.xalan-interpretive	2023-08-30 18:38:46.375256700 +0200
-+++ b/src/manifest.xalan-interpretive
 @@ -1,7 +1,6 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)
@@ -68,10 +65,9 @@ index fd5882a..f1c895e 100644
  
  Name: org/apache/xalan/
  Comment: Main Xalan engine implementing TrAX/JAXP
-diff --git a/src/manifest.xsltc b/src/manifest.xsltc
+diff -urEbwB xalan-j_2_7_3.orig/src/manifest.xsltc xalan-j_2_7_3/src/manifest.xsltc
-index fd24887..2c99f38 100644
+--- xalan-j_2_7_3.orig/src/manifest.xsltc	2023-08-30 18:36:44.211105060 +0200
---- a/src/manifest.xsltc
++++ xalan-j_2_7_3/src/manifest.xsltc	2023-08-30 18:39:52.469032707 +0200
-+++ b/src/manifest.xsltc
 @@ -1,6 +1,5 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)
@@ -79,7 +75,7 @@ index fd24887..2c99f38 100644
  
  Name: org/apache/xalan/xsltc/
  Comment: Main XSLTC engine implementing TrAX/JAXP
-@@ -19,33 +18,3 @@ Implementation-Version: @impl.version@
+@@ -19,33 +18,3 @@
  Implementation-Vendor: Apache Software Foundation
  Implementation-URL: http://xml.apache.org/xalan-j/dist/
  

xalan-j2-noxsltcdeps.patch

@@ -1,8 +1,7 @@
-diff --git a/build.xml b/build.xml
+diff -urN xalan-j_2_7_2.old/build.xml xalan-j_2_7_2/build.xml
-index 55c7d38..df58558 100644
+--- xalan-j_2_7_2.old/build.xml	2014-06-23 09:21:30.815410307 +0200
---- a/build.xml
++++ xalan-j_2_7_2/build.xml	2014-06-23 09:25:00.547429701 +0200
-+++ b/build.xml
+@@ -616,7 +616,7 @@
-@@ -616,7 +616,7 @@ $Id$
    <!-- =================================================================== -->
    <!-- Creates the xsltc jar including all support jars                    -->
    <!-- =================================================================== -->

xalan-j2.changes

@@ -1,18 +1,3 @@
--------------------------------------------------------------------
-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>
 

xalan-j2.spec

@@ -16,39 +16,39 @@
 #
 
 
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "extras"
-%bcond_without extras
-%else
-%bcond_with extras
-%endif
 %define cvs_version 2_7_3
-%global base_name xalan-j2
+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:        %{base_name}-%{version}.tar.xz
+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:         %{base_name}-noxsltcdeps.patch
+Patch0:         %{name}-noxsltcdeps.patch
-Patch1:         %{base_name}-manifest.patch
+Patch1:         %{name}-manifest.patch
-Patch2:         %{base_name}-crosslink.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
@@ -58,24 +58,6 @@ 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,
@@ -84,7 +66,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        -n %{base_name}-xsltc
+%package        xsltc
 Summary:        Java XSLT compiler
 Group:          Development/Libraries/Java
 Requires:       bcel
@@ -93,15 +75,15 @@ Requires:       jaxp_parser_impl
 Requires:       jlex
 Requires:       regexp
 
-%description    -n %{base_name}-xsltc
+%description    xsltc
 The XSLT Compiler is a Java-based tool for compiling XSLT stylesheets
 into lightweight and portable Java byte codes called translets.
 
-%package        -n %{base_name}-manual
+%package        manual
 Summary:        Manual for xalan-j2
 Group:          Development/Libraries/Java
 
-%description    -n %{base_name}-manual
+%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
@@ -110,13 +92,13 @@ a servlet, or as a module in other program.
 
 This package contains the manual for Xalan.
 
-%package        -n %{base_name}-demo
+%package        demo
 Summary:        Demonstration and samples for xalan-j2
 Group:          Development/Libraries/Java
-Requires:       %{base_name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       servlet
 
-%description    -n %{base_name}-demo
+%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
@@ -126,89 +108,78 @@ a servlet, or as a module in other program.
 This package contains demonstration and sample files for Xalan.
 
 %prep
-%setup -q -n %{base_name}-%{version}
+%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
-%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-apis) xml-apis.jar
+ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
-popd
-%endif
 popd
 pushd tools
-ln -sf $(build-classpath ant) ant.jar
-%if %{with extras}
 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 xml-stylebook) stylebook-1.0-b3_xalan-2.jar
+ln -sf $(build-classpath 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 \
-%if %{with extras}
+  xalan-interpretive.jar\
-  -Dservlet-api.jar=$(build-classpath servletapi5) \
   xsltc.unbundledjar \
   docs \
   xsltc.docs \
   samples \
   servlet
-%else
-  xalan-interpretive.jar
 
 # inject OSGi manifests
-jar \
+jar ufm build/serializer.jar %{SOURCE4}
-%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
+jar ufm build/xalan-interpretive.jar %{SOURCE5}
-    --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}/%{base_name}.jar
+  %{buildroot}%{_javadir}/%{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
-%endif
+install -p -m 644 build/serializer.jar \
+  %{buildroot}%{_javadir}/%{name}-serializer.jar
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-%if %{without extras}
+%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
-%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{base_name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
-%add_maven_depmap %{base_name}.pom %{base_name}.jar
+%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}-serializer.pom
-%{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{base_name}-serializer.pom
+%add_maven_depmap %{name}-serializer.pom %{name}-serializer.jar
-%add_maven_depmap %{base_name}-serializer.pom %{base_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
@@ -218,32 +189,14 @@ 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
 
-%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}
-
-# 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
+  jaxp_transform_impl %{_javadir}/%{name}.jar 30
 
 %preun
 {
   [ $1 = 0 ] || exit 0
-  update-alternatives --remove jaxp_transform_impl %{_javadir}/%{base_name}.jar
+  update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar
 } >/dev/null 2>&1 || :
 
 %files -f .mfiles
@@ -254,18 +207,14 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \
 %ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar
 %{_javadir}/jaxp_transform_impl.jar
 
-%else
+%files xsltc -f .mfiles-xsltc
 
-%files -n %{base_name}-xsltc -f .mfiles-xsltc
+%files manual
-
-%files -n %{base_name}-manual
 %defattr(0644,root,root,0755)
 %doc build/docs/*
 
-%files -n %{base_name}-demo
+%files demo
 %defattr(0644,root,root,0755)
-%{_datadir}/%{base_name}
+%{_datadir}/%{name}
-
-%endif
 
 %changelog