2024-10-11 23:30:07 +00:00
committed by Git OBS Bridge
parent fd02563083
commit b1c1cbdc4a
2 changed files with 3 additions and 14 deletions

View File

@@ -1,11 +0,0 @@
--- fop-2.10/fop/build.xml 2024-10-11 22:43:01.341883874 +0200
+++ fop-2.10/fop/build.xml 2024-10-11 22:44:41.030156741 +0200
@@ -568,7 +568,7 @@
<!-- =================================================================== -->
<!-- Creates the class package -->
<!-- =================================================================== -->
- <target name="package" depends="mvn-jars,jar-main,jar-hyphenation,jar-sandbox" description="Generates the jar files"/>
+ <target name="package" depends="jar-main,jar-hyphenation,jar-sandbox" description="Generates the jar files"/>
<target name="servlet" depends="package" description="Generates the WAR with the sample FOP servlet">
<echo message="Creating the WAR file"/>
<war warfile="${build.dir}/fop.war" webxml="${servlet.src.dir}/main/webapp/WEB-INF/web.xml">

View File

@@ -43,7 +43,6 @@ Patch4: java8-compatibility.patch
Patch5: reproducible-build-manifest.patch
Patch6: fop-2.10-QDox-2.0.patch
Patch7: reproducible.patch
Patch8: build-fix.patch
BuildRequires: ant >= 1.9.15
BuildRequires: apache-pdfbox >= 2.0.23
BuildRequires: bouncycastle
@@ -88,7 +87,6 @@ find -name "*.jar" | xargs -t rm
%patch -P 5 -p1
%patch -P 6 -p1
%patch -P 7 -p1
%patch -P 8 -p1
# Replace keyword "VERSION" in XML files with the real one:
for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
@@ -133,7 +131,9 @@ build-jar-repository -s fop/lib \
xmlgraphics-commons \
qdox
ant -f fop/build.xml \
ant \
-f fop/build.xml \
-Ddev=true \
package
# Build the manpage(s) and HTML