From 850890b3b9e9d1771e0e179af81542e0a91d4055 Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Sat, 16 Sep 2023 09:56:44 +0800 Subject: [PATCH] Remove the mif parameter in the help message (cherry picked from commit 5b2dc76e0a2f5587ad3cdde81cc41dbc2575d157) --- ...he-mif-parameter-in-the-help-message.patch | 20 +++++++++++++++++++ fop.spec | 6 +++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 Remove-the-mif-parameter-in-the-help-message.patch diff --git a/Remove-the-mif-parameter-in-the-help-message.patch b/Remove-the-mif-parameter-in-the-help-message.patch new file mode 100644 index 0000000..603a1f4 --- /dev/null +++ b/Remove-the-mif-parameter-in-the-help-message.patch @@ -0,0 +1,20 @@ +diff -Nur a/fop-core/src/main/java/org/apache/fop/cli/CommandLineOptions.java b/fop-core/src/main/java/org/apache/fop/cli/CommandLineOptions.java +--- a/fop-core/src/main/java/org/apache/fop/cli/CommandLineOptions.java 2017-04-03 19:23:57.000000000 +0800 ++++ b/fop-core/src/main/java/org/apache/fop/cli/CommandLineOptions.java 2023-09-16 09:21:10.478347745 +0800 +@@ -1183,7 +1183,7 @@ + public static void printUsage(PrintStream out) { + out.println( + "\nUSAGE\nfop [options] [-fo|-xml] infile [-xsl file] " +- + "[-awt|-pdf|-mif|-rtf|-tiff|-png|-pcl|-ps|-txt|-at [mime]|-print] \n" ++ + "[-awt|-pdf|-rtf|-tiff|-png|-pcl|-ps|-txt|-at [mime]|-print] \n" + + " [OPTIONS] \n" + + " -version print FOP version and exit\n" + + " -x dump configuration settings \n" +@@ -1274,7 +1274,6 @@ + + " fop -xml foo.xml -xsl foo.xsl -pdf foo.pdf\n" + + " fop -xml foo.xml -xsl foo.xsl -foout foo.fo\n" + + " fop -xml - -xsl foo.xsl -pdf -\n" +- + " fop foo.fo -mif foo.mif\n" + + " fop foo.fo -rtf foo.rtf\n" + + " fop foo.fo -print\n" + + " fop foo.fo -awt\n"); diff --git a/fop.spec b/fop.spec index f339bd5..e2b3297 100644 --- a/fop.spec +++ b/fop.spec @@ -1,6 +1,6 @@ Name: fop Version: 2.2 -Release: 7 +Release: 8 Summary: Formatter for printing XSL-driven XML Files License: BSD and Apache-2.0 and MIT and Apache-1.1 URL: https://xmlgraphics.apache.org/fop @@ -15,6 +15,7 @@ Patch0002: Port-to-QDox-2.0.patch Patch0003: Allow-javascript-in-javadoc.patch Patch0004: Non-free-colour-profile-was-removed.patch Patch0005: Update-to-newer-batik.patch +Patch0006: Remove-the-mif-parameter-in-the-help-message.patch BuildRequires: ant apache-commons-io apache-commons-logging avalon-framework BuildRequires: batik fontbox javapackages-local junit qdox servlet BuildRequires: xmlunit xmlgraphics-commons >= 1.5 @@ -83,6 +84,9 @@ install -D -p -m 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Sat Sep 16 2023 liyanan - 2.2-8 +- Remove the mif parameter in the help message + * Fri Sep 08 2023 yaoxin - 2.2-7 - Fix build failure caused by batik upgrade to 1.17 -- Gitee