From cdcc1b5b3102b4c32ec1cc29add08dbad6eeaa3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Wed, 10 Jul 2024 11:00:12 +0200 Subject: [PATCH] Remove binary JAR files and replace them with available dependencies --- docbook5-style-xsl.spec | 46 ++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/docbook5-style-xsl.spec b/docbook5-style-xsl.spec index b056ebc..077203b 100644 --- a/docbook5-style-xsl.spec +++ b/docbook5-style-xsl.spec @@ -1,6 +1,6 @@ Name: docbook5-style-xsl Version: 1.79.2 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Norman Walsh's XSL stylesheets for DocBook 5.X @@ -17,6 +17,24 @@ Requires(post): libxml2 >= 2.4.8 Requires(postun): libxml2 >= 2.4.8 Conflicts: passivetex < 1.21 +# Provide an alternative to removed JAR files via Fedora Packages +# lucene-core.jar (lucene-core-3.0.0.jar), lucene-analysis-common.jar (lucene-analyzers-3.0.0.jar) +Requires: lucene-core lucene-analysis-common +# ant-apache-xalan2.jar (xalan27.jar) +Requires: ant-apache-xalan2 +# tagsoup.jar (tagsoup-1.2.1.jar) +Requires: tagsoup +# apache-commons-codec.jar (commons-codec-1.3.jar), apache-commons-logging.jar (commons-logging-1.1.1.jar) +Requires: apache-commons-codec apache-commons-logging +# xml-commons-apis.jar (xml-apis.jar), xml-commons-resolver.jar (xmlresolver.jar) +Requires: xml-commons-apis xml-commons-resolver +# xerces-j2.jar (xercesImpl.jar) +Requires: xerces-j2 +# xalan-j2.jar, xalan-j2-serializer.jar,jaxp_transform_impl.jar, xsltc.jar (xsltc.jar, xalan.jar, serializer.jar) +Requires: xalan-j2 xalan-j2-xsltc +# ant-contrib.jar (ant-contrib-1.0b3.jar) +Requires: ant-contrib + BuildArch: noarch Source0: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F{%version}/docbook-xsl-%{version}.tar.bz2 @@ -26,10 +44,10 @@ DocBook 5 document to other formats, such as HTML, manpages, FO, XHMTL and other formats. They are highly customizable. For more information see W3C page about XSL. -#Don't ship Java extensions in Fedora as they are not compiled from the source -#Shiping sources instead of binary jars was requested by -#https://lists.oasis-open.org/archives/docbook-apps/201408/msg00008.html -#Sources available in the docbook stylesheets svn repository, but not packaged. +# Don't ship Java extensions in Fedora as they are not compiled from the source +# Shiping sources instead of binary jars was requested by +# https://lists.oasis-open.org/archives/docbook-apps/201408/msg00008.html +# Sources available in the docbook stylesheets svn repository, but not packaged. %if 0%{?rhel} >= 7 %package extensions Summary: Norman Walsh's XSL stylesheets extensions for DocBook 5.X @@ -44,11 +62,21 @@ This package contains Java extensions for XSL namespace aware stylesheets. %prep %setup -q -n docbook-xsl-%{version} -#remove .gitignore files + +# Remove .gitignore files rm -rf $(find -name '.gitignore' -type f) -#make ruby scripts executable + +# Remove binary JAR files +rm -f extensions/*.jar +rm -f tools/lib/*.jar + +# Make ruby scripts executable chmod +x epub/bin/dbtoepub +# Remove misc +rm slides/slidy/scripts/slidy.js.gz +rm roundtrip/template.dot + %build %install @@ -110,6 +138,10 @@ if [ "$1" = 0 ]; then fi %changelog +* Sat Jun 29 2024 Ondrej Sloup - 1.79.2-20 +- Remove binary JAR files and replace them with available dependencies +- Related: RHEL-37894 + * Mon Jun 24 2024 Troy Dawson - 1.79.2-19 - Bump release for June 2024 mass rebuild