Fridrich Strba 2019-01-21 16:39:59 +00:00 committed by Git OBS Bridge
parent 654a9fd87b
commit 3c1979a87f
6 changed files with 23 additions and 30 deletions

View File

@ -29,7 +29,7 @@ fi
# Rest of the configuration
MAIN_CLASS=org.apache.fop.tools.fontlist.FontListMain
BASE_JARS="xmlgraphics-fop xmlgraphics-commons batik-all avalon-framework xerces-j2 xalan-j2 xalan-j2-serializer apache-commons-logging apache-commons-io"
BASE_JARS="xmlgraphics-fop xmlgraphics-commons batik-all avalon-framework-impl avalon-framework-api xerces-j2 xalan-j2 xalan-j2-serializer commons-logging commons-io"
# Set parameters
set_jvm

View File

@ -41,7 +41,7 @@ else
MAIN_CLASS=${MAIN_CLASS_TTF}
fi
BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-io commons-logging avalon-framework xml-commons-jaxp-1.3-apis xerces-j2 xalan-j2 xalan-j2-serializer"
BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-io commons-logging avalon-framework-impl avalon-framework-api xml-commons-apis xerces-j2 xalan-j2 xalan-j2-serializer"
# Set parameters
set_jvm

View File

@ -25,7 +25,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>fop</artifactId>
<packaging>jar</packaging>
<name>Apache FOP</name>
<version>2.1</version>
<version>@version@</version>
<url>http://xmlgraphics.apache.org/fop/</url>
<description>Apache FOP (Formatting Objects Processor) is the world's first print formatter driven by XSL formatting objects (XSL-FO) and the world's first output independent formatter. It is a Java application that reads a formatting object (FO) tree and renders the resulting pages to a specified output. Output formats currently supported include PDF, PCL, PS, AFP, TIFF, PNG, SVG, XML (area tree representation), Print, AWT and TXT. The primary output target is PDF.</description>
<inceptionYear>1999</inceptionYear>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 21 16:37:54 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Fix build with new avalon-framework and batik
- Install maven pom file
-------------------------------------------------------------------
Fri Jan 4 16:20:13 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -33,7 +33,7 @@ fi
# Rest of the configuration
MAIN_CLASS=org.apache.fop.cli.Main
BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-logging commons-io avalon-framework batik-all xml-commons-jaxp-1.3-apis xml-commons-jaxp-1.3-apis-ext"
BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-logging commons-io avalon-framework-api avalon-framework-impl batik-all xml-commons-apis xml-commons-apis-ext"
# Set parameters
set_jvm

View File

@ -44,15 +44,14 @@ Patch4: java8-compatibility.patch
Patch5: reproducible-build-manifest.patch
Patch6: fop-2.1-QDox-2.0.patch
BuildRequires: ant >= 1.6.5
BuildRequires: apache-commons-io >= 2.4
BuildRequires: apache-commons-logging
BuildRequires: apache-pdfbox
BuildRequires: avalon-framework
BuildRequires: avalon-framework >= 4.3
BuildRequires: commons-io >= 2.4
BuildRequires: commons-logging
BuildRequires: docbook-xsl-stylesheets
BuildRequires: java-devel >= 1.8
# Needed for maven conversions
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: libxslt
BuildRequires: qdox >= 2.0
BuildRequires: servlet_api
@ -61,10 +60,10 @@ BuildRequires: xml-commons-apis >= 1.3
BuildRequires: xmlgraphics-batik >= 1.8
BuildRequires: xmlgraphics-commons >= 2.1
#!BuildIgnore: saxon
Requires: apache-commons-io >= 2.4
Requires: apache-commons-logging
Requires: apache-pdfbox
Requires: avalon-framework
Requires: avalon-framework >= 4.3
Requires: commons-io >= 2.4
Requires: commons-logging
Requires: java >= 1.8
Requires: xml-commons-apis >= 1.3
Requires: xmlgraphics-batik >= 1.8
@ -100,31 +99,19 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
sed -i "s=@VERSION@=%{version}=" $x
done
sed -i "s=@version@=%{version}=" xmlgraphics-fop-pom-template.pom
%build
pushd lib
ln -s $(build-classpath avalon-framework)
ln -s $(build-classpath avalon-framework-api)
ln -s $(build-classpath avalon-framework-impl)
ln -s $(build-classpath commons-io)
ln -s $(build-classpath commons-logging)
ln -s $(build-classpath fontbox)
ln -s $(build-classpath servlet_api)
ln -s $(build-classpath xml-commons-jaxp-1.3-apis)
ln -s $(build-classpath xml-commons-jaxp-1.3-apis-ext)
ln -s $(build-classpath xmlgraphics-batik/anim)
ln -s $(build-classpath xmlgraphics-batik/awt-util)
ln -s $(build-classpath xmlgraphics-batik/bridge)
ln -s $(build-classpath xmlgraphics-batik/css)
ln -s $(build-classpath xmlgraphics-batik/dom)
ln -s $(build-classpath xmlgraphics-batik/ext)
ln -s $(build-classpath xmlgraphics-batik/extension)
ln -s $(build-classpath xmlgraphics-batik/gvt)
ln -s $(build-classpath xmlgraphics-batik/parser)
ln -s $(build-classpath xmlgraphics-batik/svg-dom)
ln -s $(build-classpath xmlgraphics-batik/svggen)
ln -s $(build-classpath xmlgraphics-batik/script)
ln -s $(build-classpath xmlgraphics-batik/transcoder)
ln -s $(build-classpath xmlgraphics-batik/util)
ln -s $(build-classpath xmlgraphics-batik/xml)
ln -s $(build-classpath xml-commons-apis)
ln -s $(build-classpath xml-commons-apis-ext)
ln -s $(build-classpath batik-all)
ln -s $(build-classpath xmlgraphics-commons)
ln -s $(build-classpath qdox)
popd
@ -149,7 +136,7 @@ install -m 644 build/%{bname}.jar %{buildroot}%{_javadir}/%{name}.jar
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
install -pm 644 xmlgraphics-fop-pom-template.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# script