Fridrich Strba 2020-06-03 17:06:14 +00:00 committed by Git OBS Bridge
parent f35fee5346
commit cf1d1f5333
5 changed files with 48 additions and 101 deletions

View File

@ -1,79 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
<name>Apache FOP All-In-One</name>
<description>XML Graphics Format Object Processor All-In-One</description>
<parent>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop-parent</artifactId>
<version>2.5</version>
</parent>
<dependencies>
<!-- fop deps -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>fop-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>fop-events</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>fop-core</artifactId>
<version>${project.version}</version>
</dependency>
<!-- test deps -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>package-all</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<addMavenDescriptor>false</addMavenDescriptor>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<mainClass>org.apache.fop.cli.Main</mainClass>
</manifest>
<manifestEntries>
<SpecificationTitle>XSL-FO - Extensible Stylesheet Language</SpecificationTitle>
<SpecificationVersion>1.1</SpecificationVersion>
<SpecificationVendor>World Wide Web Consortium</SpecificationVendor>
<SpecificationURL>http://www.w3.org/TR/xsl</SpecificationURL>
</manifestEntries>
</archive>
<descriptors>
<descriptor>src/tools/resources/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

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-impl avalon-framework-api xerces-j2 xalan-j2 xalan-j2-serializer commons-logging commons-io"
BASE_JARS="xmlgraphics-fop xmlgraphics-commons batik-all 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-impl avalon-framework-api xml-commons-apis xerces-j2 xalan-j2 xalan-j2-serializer"
BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-io commons-logging xml-commons-apis xerces-j2 xalan-j2 xalan-j2-serializer"
# Set parameters
set_jvm

View File

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

View File

@ -26,12 +26,11 @@ License: Apache-2.0
Group: Productivity/Publishing/XML
URL: https://xmlgraphics.apache.org/fop/
Source0: https://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-%{version}-src.tar.gz
Source1: https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/fop/%{version}/fop-%{version}.pom
Source1: https://download.sourceforge.net/project/offo/offo-hyphenation/2.2/offo-hyphenation.zip
#FIX-OPENSUSE: add xmlgraphics-commons to classpath
Source2: %{name}.script
Source3: %{name}-fontmetrics.script
Source4: %{name}-fontlist.script
Source5: https://download.sourceforge.net/project/offo/offo-hyphenation/2.2/offo-hyphenation.zip
# Manpage(s)
Source10: %{name}.xml
Source11: %{name}-fontmetrics.xml
@ -43,31 +42,35 @@ Patch4: java8-compatibility.patch
# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- boo#1110024
Patch5: reproducible-build-manifest.patch
Patch6: fop-2.5-QDox-2.0.patch
BuildRequires: ant >= 1.6.5
BuildRequires: apache-pdfbox
BuildRequires: avalon-framework >= 4.3
BuildRequires: ant >= 1.8.4
BuildRequires: apache-pdfbox >= 2.0
BuildRequires: commons-io >= 2.4
BuildRequires: commons-logging
BuildRequires: docbook-xsl-stylesheets
# Needed for maven conversions
BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: libxslt
BuildRequires: qdox >= 2.0
BuildRequires: unzip
BuildRequires: xml-commons-apis >= 1.3
BuildRequires: xml-commons-apis
BuildRequires: xmlgraphics-batik >= 1.11
BuildRequires: xmlgraphics-commons >= 2.1
#!BuildIgnore: saxon
Requires: apache-pdfbox
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-commons >= 2.1
%requires_ge xmlgraphics-batik
Requires: xml-commons-apis
Requires: mvn(com.thoughtworks.qdox:qdox) >= 2.0
Requires: mvn(commons-io:commons-io)
Requires: mvn(commons-logging:commons-logging)
Requires: mvn(javax.servlet:servlet-api)
Requires: mvn(org.apache.pdfbox:fontbox) >= 2.0
Requires: mvn(org.apache.xmlgraphics:batik-anim) >= 1.11
Requires: mvn(org.apache.xmlgraphics:batik-awt-util) >= 1.11
Requires: mvn(org.apache.xmlgraphics:batik-bridge) >= 1.11
Requires: mvn(org.apache.xmlgraphics:batik-extension) >= 1.11
Requires: mvn(org.apache.xmlgraphics:batik-gvt) >= 1.11
Requires: mvn(org.apache.xmlgraphics:batik-transcoder) >= 1.11
Requires: mvn(org.apache.xmlgraphics:xmlgraphics-commons)
Provides: %{bname} = %{version}-%{release}
Obsoletes: %{bname} < %{version}-%{release}
Provides: fo-formatter = %{version}-%{release}
@ -81,7 +84,7 @@ formats: PDF (primary output target), PCL, PS, SVG, XML (area tree
representation), Print, AWT, MIF, and TXT.
%prep
%setup -q -n %{bname}-%{version} -a5
%setup -q -n %{bname}-%{version} -a1
ln -tfop/hyph offo-hyphenation/hyph/*.xml
find -name "*.jar" | xargs -t rm
# Remove this file. It needs jai and we don't compile it.
@ -99,17 +102,40 @@ for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
sed -i "s=@VERSION@=%{version}=" $x
done
# Building with ant, so the parent is pointless
%pom_remove_parent fop
%pom_xpath_inject pom:project "<version>%{version}</version>" fop
# When building with ant, the fop.jar is an all-in jar,
# so adapt the dependencies accordingly
# Remove dependencies on fop modules included in the jar
%pom_remove_dep :fop-events fop
%pom_remove_dep :fop-util fop
%pom_remove_dep :fop-core fop
# Add dependencies of fop modules included in the jar
%pom_add_dep com.thoughtworks.qdox:qdox:2 fop
%pom_add_dep commons-io:commons-io:1.3.1 fop
%pom_add_dep commons-logging:commons-logging:1.0.4 fop
%pom_add_dep javax.servlet:servlet-api:2.2 fop
%pom_add_dep org.apache.pdfbox:fontbox:2.0.16 fop
%pom_add_dep org.apache.xmlgraphics:batik-anim:1.13 fop
%pom_add_dep org.apache.xmlgraphics:batik-awt-util:1.13 fop
%pom_add_dep org.apache.xmlgraphics:batik-bridge:1.13 fop
%pom_add_dep org.apache.xmlgraphics:batik-extension:1.13 fop
%pom_add_dep org.apache.xmlgraphics:batik-gvt:1.13 fop
%pom_add_dep org.apache.xmlgraphics:batik-transcoder:1.13 fop
%pom_add_dep org.apache.xmlgraphics:xmlgraphics-commons:2.4 fop
%build
build-jar-repository -s fop/lib \
avalon-framework-api \
avalon-framework-impl \
commons-io \
commons-logging \
fontbox \
glassfish-servlet-api \
xml-commons-apis \
xml-commons-apis-ext \
batik-all \
xml-commons-apis \
xml-commons-apis-ext \
xmlgraphics-commons \
qdox