Hello community,
here is the log from the commit of package xmlgraphics-fop for openSUSE:Factory
checked in at 2020-05-20 18:36:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlgraphics-fop (Old)
and /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-fop"
Wed May 20 18:36:49 2020 rev:44 rq:806994 version:2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlgraphics-fop/xmlgraphics-fop.changes
2020-04-05 20:52:46.457138365 +0200
+++
/work/SRC/openSUSE:Factory/.xmlgraphics-fop.new.2738/xmlgraphics-fop.changes
2020-05-20 18:36:54.104160216 +0200
@@ -1,0 +2,9 @@
+Mon May 18 14:41:12 UTC 2020 - Fridrich Strba <[email protected]>
+
+- Do not install the OFFO hyphenation files to datadir, but package
+ instead the xmlgraphics-fop-hyph.jar and
+ xmlgraphics-fop-sandbox.jar that we build anyway. This fixes
+ boo#1145693
+- Clean up the build a bit
+
+-------------------------------------------------------------------
Old:
----
xmlgraphics-fop-pom-template.pom
New:
----
fop-2.1.pom
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlgraphics-fop.spec ++++++
--- /var/tmp/diff_new_pack.ROLdv5/_old 2020-05-20 18:36:55.492163125 +0200
+++ /var/tmp/diff_new_pack.ROLdv5/_new 2020-05-20 18:36:55.492163125 +0200
@@ -26,9 +26,9 @@
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
#FIX-OPENSUSE: add xmlgraphics-commons to classpath
-Source1: %{name}.script
-Source2:
https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-2_1/xmlgraphics-fop-pom-template.pom
+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
@@ -67,8 +67,8 @@
Requires: commons-logging
Requires: java >= 1.8
Requires: xml-commons-apis >= 1.3
-Requires: xmlgraphics-batik >= 1.8
Requires: xmlgraphics-commons >= 2.1
+%requires_ge xmlgraphics-batik
Provides: %{bname} = %{version}-%{release}
Obsoletes: %{bname} < %{version}-%{release}
Provides: fo-formatter = %{version}-%{release}
@@ -99,12 +99,10 @@
%patch7 -p1
%endif
-cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
# Replace keyword "VERSION" in XML files with the real one:
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
build-jar-repository -s lib \
@@ -138,15 +136,17 @@
# jars
mkdir -p %{buildroot}%{_javadir}
install -m 644 build/%{bname}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 build/%{bname}-hyph.jar %{buildroot}%{_javadir}/%{name}-hyph.jar
+install -m 644 build/%{bname}-sandbox.jar
%{buildroot}%{_javadir}/%{name}-sandbox.jar
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 xmlgraphics-fop-pom-template.pom
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# script
mkdir -p %{buildroot}%{_bindir}
-cp -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}
+cp -p %{SOURCE2} %{buildroot}%{_bindir}/%{name}
cp -p %{SOURCE3} %{buildroot}%{_bindir}/%{name}-fontmetrics
cp -p %{SOURCE4} %{buildroot}%{_bindir}/%{name}-fontlist
# compat symlink
@@ -155,9 +155,6 @@
ln -s %{name}-fontlist %{buildroot}%{_bindir}/%{bname}-fontlist
# data
-mkdir -p %{buildroot}%{_datadir}/%{name}
-cp -pr hyph %{buildroot}%{_datadir}/%{name}
-cp -pr conf %{buildroot}%{_datadir}/%{name}
install -D -m 644 conf/fop.xconf %{buildroot}%{_sysconfdir}/fop.xconf
# Manpages
@@ -175,17 +172,17 @@
popd
%files -f .mfiles
+%{_javadir}/%{name}-hyph.jar
+%{_javadir}/%{name}-sandbox.jar
%license LICENSE
%doc NOTICE README known-issues.xml
%doc *.html
-
%attr(0755,root,root) %{_bindir}/%{name}
%{_bindir}/%{bname}
%attr(0755,root,root) %{_bindir}/%{name}-fontmetrics
%{_bindir}/%{bname}-fontmetrics
%attr(0755,root,root) %{_bindir}/%{name}-fontlist
%{_bindir}/%{bname}-fontlist
-%{_datadir}/%{name}
%{_mandir}/man1/*
%config(noreplace) %{_sysconfdir}/fop.xconf
++++++ fop-2.1.pom ++++++
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- $Id$ -->
<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/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
<packaging>jar</packaging>
<name>Apache FOP</name>
<version>2.1</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>
<mailingLists>
<mailingList>
<name>FOP Users List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/</archive>
</mailingList>
<mailingList>
<name>FOP Developer List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/</archive>
</mailingList>
<mailingList>
<name>FOP Commit List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/</archive>
</mailingList>
</mailingLists>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</developerConnection>
<url>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/?root=Apache-SVN</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>7</version>
</parent>
<dependencies>
<!-- XML Graphics -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-svg-dom</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-bridge</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-awt-util</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-gvt</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-transcoder</artifactId>
<version>1.8</version>
<exclusions>
<exclusion>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-extension</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-ext</artifactId>
<version>1.8</version>
</dependency>
<!-- other dependencies -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
<version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
<version>4.3.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
++++++ xmlgraphics-fop.script ++++++
--- /var/tmp/diff_new_pack.ROLdv5/_old 2020-05-20 18:36:55.584163318 +0200
+++ /var/tmp/diff_new_pack.ROLdv5/_new 2020-05-20 18:36:55.588163326 +0200
@@ -33,7 +33,7 @@
# Rest of the configuration
MAIN_CLASS=org.apache.fop.cli.Main
-BASE_JARS="xmlgraphics-fop 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 avalon-framework-api avalon-framework-impl batik-all
fontbox xml-commons-apis xml-commons-apis-ext"
# Set parameters
set_jvm
