Accepting request 791181 from Java:packages
- Added patch:
* fop-2.1-batik-xmlconstants.patch
+ apply when building with batik >= 1.11
+ batik 1.11 moved XMLConstants class from
org.apache.batik.util to org.apache.batik.constants
- Add fontbox to classpath: (rh#1413340)
- Build against glassfish-servlet-api
- Fix build with new avalon-framework and batik
- Install maven pom file
- Added patch:
* fop-2.1-QDox-2.0.patch
+ Build against QDox >= 2
- Bring back the java-devel/java requirements to >= 1.8; we will
fix the ByteBuffer/CharBuffer compatibilities as they arise.
- Modified patch:
* java8-compatibility.patch
+ Fix fix ByteBuffer/CharBuffer incompatibilities with java8
Cast all the java.nio.ByteBuffer and java.nio.CharBuffer
instances to java.nio.Buffer before calling the clear(),
flip(), limit(int), mark(), reset() and rewind() methods.
- version 2.1
Change requirement from java-devel-openjdk >= 1.8.0 to
java-devel-openjdk >= 9 to avoid tracebacks because of compatibility
issues with java.nio.Buffer, for example:
java.lang.NoSuchMethodError:
java.nio.CharBuffer.rewind()Ljava/nio/CharBuffer;
- Do not depend on a particular xml-commons-apis provider.
- Add reproducible-build-manifest.patch: Remove custom "Build-Id"
from manifests. It contains date and other information making the
build unreproducible (boo#1110024).
- Fix building with ant >= 1.9.12
- Added patch:
* java8-compatibility.patch
+ Fix compatibility with java8 and lower when built with java9
or higher
- Don't condition the maven defines on release version, but on
_maven_repository being defined
- Fix build with jdk9: specify java source and target 1.6 and fix
javadoc build
- Add BuildRequires: javapackages-local (for maven conversions)
- Make sure to apply new file list for Tumbleweed only
(FATE#322405)
- Add patch to fix build with stricter javadoc in version 8:
* fix-javadoc-java8.patch (boo#1027467)
- Fix file list on SLE
- Fix manpage for xmlgraphics-fop-fontmetrics
- Update to fop 2.1
- https://xmlgraphics.apache.org/fop/changes.html#version_2.1
- Remove upstreamed fop-commons-2.0.patch
and xmlgraphics-fop-xconf.patch
- Add hyphenation-more-stack.patch to fix build with offo 2.2
- Fix build with new javapackages-tools
- Spec-cleanify
- Do not ever run tests, we lack quite packages to do so anyway
- Drop fop-1.1-src.tar.gz.asc xmlgraphics-fop.keyring as upstream
does not provide those anymore
- Apply patch to build with new xmlgraphics-commons:
* fop-commons-2.0.patch
- Do not depend on ant-trax
- Drop javadoc package so we build this package
- Move from jpackage-utils to javapackage-tools
- use new add_maven_depmap
- add missing commons packages to BuildRequires
- add gpg verification
- fix a typo in a xmlgraphics-fop.script (bnc#817145)
- (build) require xml-commons-apis, the org.w3c.svg are used inside fop
part of a fix for bnc#800694
- drop excalibur usage from all classpaths, use avalon-framework instead
- drop excalibur-avalon from dependencies, fop now uses avalon-framework
- patched fop.xconf
* added <auto-detect/> to pdf renderer section, so now possible to use system fonts like font-family="DejaVuSansMono"
- fix the spec file to install a (default) fop.xconf file in /etc
- patched scripts to use /etc/fop.xconf
- add fo-formatter to provides upon a request of doc team
- fixed "Class not found" errors in fop scripts
- add commons-logging and commons-io to Requires and fop script
- removed uneeded xalan-j2, xmlcommons and xerces from dependencies
- update to 1.1
* many bug fixes and a number of improvements
* support for Complex Scripts (e.g., Arabic, Hebrew, Indic, and Southeast
* Asian scripts)
* http://xmlgraphics.apache.org/fop/1.1/releaseNotes_1.1.html
* This release implements a substantial subset of the W3C
* XSL-FO 1.1 Recommendation. For a detailed overview of FOP's compliance with
* this recommendation, see Compliance.
* http://xmlgraphics.apache.org/fop/compliance.html
- obsoleted xmlgraphics-fop-asf51789.patch
- obsoleted xmlgraphics-fop-build.patch
- restored gzipped archive to avoid HTTP 404
- disabled tests (they take ages to build and they fail anyway, so do we really need them)?
- added standard hyphenation from OFFO
- told ant to use UTF-8
- fix for asf#51789
- Recompressed gzip archive to bz2 to avoid warning
- Fixed non-conffile-in-etc warning for %{_mavendepmapfragdir}
- Added new xmlgraphics-fontmetrics and xmlgraphics-fontlist scripts
to help for better FOP configuration
- Added manpage and HTML for all scripts (xmlgraphics-fop,
xmlgraphics-fop-fontmetrics, and xmlgraphics-fop-fontlist)
- Created links without prefix xmlgraphics-fop for
xmlgraphics-fop-fontmetrics and xmlgraphics-fop-fontlist
- Created links for all manpages without prefix xmlgraphics-fop
- Added two new scripts for creating font metrics and font lists
- Fixed xmlgraphic-fop script:
* Added excalibur/avalon-framework-impl in BASE_JAR variable to
avoid exception in thread "main" java.lang.NoClassDefFoundError:
org/apache/avalon/framework/configuration/DefaultConfigurationBuilder
Caused by: java.lang.ClassNotFoundException:
org.apache.avalon.framework.configuration.DefaultConfigurationBuilder
* Replaced xmlgraphics-batik/util in BASE_JAR variable to
avoid ClassNotFoundException: org.apache.batik.bridge.UserAgent
- correct fop Provides: Obsolete:
- fix bnc#650138 - fop update wanted
* fix memory leak in property cache
* change FONode.addCharacters() parameter to closer match the signature of the standard SAX characters() event
* new event handling framework
* support for font substitution
* support for addressing all glyphs available in a Type 1 font,
not just the ones in the font's primary encoding.
* limited support for pages of different inline-progression-dimensions within a page-sequence.
* minimal support for integer keep values on the various keep properties on block-level FOs.
* new AFPGraphics2D implementation which provides the ability to use Batik to
drive the production of AFP Graphics (GOCA) output from SVG.
* new Resource group leveling, external streaming, and de-duplication of images and
graphics using IncludeObject and ResourceGroup.
* new Native image embedding support (e.g. JPEG, GIF, TIFF) using ObjectContainer
and a MOD:CA Registry implementation.
- merge with xmlgraphics-fop-0.95-6.jpp5.src.rpm
- fixed bnc#467866 - fop fails if JAVACMD_OPTS is set
- update to version 0.95, list of changes at:
http://xmlgraphics.apache.org/fop/0.95/changes_0.95.html
- fop requires java 1.4 now
- use unversioned Requires: jre
- avoid build cycle between fop and saxon
- update to version 0.94, major changes:
* Add support for font auto-detection (JM) Thanks to Adrian Cumiskey
* Add support for the border-collapsing model in tables (VH, JM)
* Add support for named destinations in PDF (JB)
* Add support for UAX#14 type line breaking (MM)
full list of changes at:
http://xmlgraphics.apache.org/fop/0.94/changes_0.94.html
- update to version 0.93
- build with gcj
- added unzip to buildrequires
- converted neededforbuild to BuildRequires
- do no longer use setJava
- Provide wrapper scripts for fop.sh and xalan.sh to make it find the
java environment; reported by Thomas Schraitle; fix provided by Petr
Mladek [#39581].
- New package: version 0.20.5.
OBS-URL: https://build.opensuse.org/request/show/791181
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlgraphics-fop?expand=0&rev=43
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
14fc964b22
11
fop-2.1-batik-xmlconstants.patch
Normal file
11
fop-2.1-batik-xmlconstants.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- fop-2.1/src/java/org/apache/fop/svg/SVGUtilities.java 2016-01-07 15:13:29.000000000 +0100
|
||||
+++ fop-2.1/src/java/org/apache/fop/svg/SVGUtilities.java 2020-04-03 12:41:31.331947147 +0200
|
||||
@@ -29,7 +29,7 @@
|
||||
import org.w3c.dom.Element;
|
||||
|
||||
import org.apache.batik.anim.dom.SVGDOMImplementation;
|
||||
-import org.apache.batik.util.XMLConstants;
|
||||
+import org.apache.batik.constants.XMLConstants;
|
||||
|
||||
/**
|
||||
* Some utilities for creating svg DOM documents and elements.
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 3 10:50:59 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* fop-2.1-batik-xmlconstants.patch
|
||||
+ apply when building with batik >= 1.11
|
||||
+ batik 1.11 moved XMLConstants class from
|
||||
org.apache.batik.util to org.apache.batik.constants
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 14 23:18:43 UTC 2019 - Frank H. Ellenberger <frank.h.ellenberger@gmail.com>
|
||||
|
||||
@ -29,7 +38,7 @@ Thu Dec 6 21:54:53 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
- Modified patch:
|
||||
* java8-compatibility.patch
|
||||
+ Fix fix ByteBuffer/CharBuffer incompatibilities with java8
|
||||
Cast all the java.nio.ByteBuffer and java.nio.CharBuffer
|
||||
Cast all the java.nio.ByteBuffer and java.nio.CharBuffer
|
||||
instances to java.nio.Buffer before calling the clear(),
|
||||
flip(), limit(int), mark(), reset() and rewind() methods.
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xmlgraphics-fop
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2000-2008, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -43,15 +43,16 @@ Patch4: java8-compatibility.patch
|
||||
# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- boo#1110024
|
||||
Patch5: reproducible-build-manifest.patch
|
||||
Patch6: fop-2.1-QDox-2.0.patch
|
||||
Patch7: fop-2.1-batik-xmlconstants.patch
|
||||
BuildRequires: ant >= 1.6.5
|
||||
BuildRequires: apache-pdfbox
|
||||
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: glassfish-servlet-api
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: qdox >= 2.0
|
||||
@ -92,7 +93,11 @@ rm src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
# Batik 1.11 moved XMLConstants from org.apache.batik.util to org.apache.batik.constants
|
||||
%patch6 -p1
|
||||
%if %{?pkg_vcmp:%pkg_vcmp xmlgraphics-batik >= 1.11}%{!?pkg_vcmp:0}
|
||||
%patch7 -p1
|
||||
%endif
|
||||
|
||||
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
|
||||
# Replace keyword "VERSION" in XML files with the real one:
|
||||
@ -102,21 +107,21 @@ done
|
||||
sed -i "s=@version@=%{version}=" xmlgraphics-fop-pom-template.pom
|
||||
|
||||
%build
|
||||
pushd lib
|
||||
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 glassfish-servlet-api)
|
||||
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
|
||||
build-jar-repository -s lib \
|
||||
avalon-framework-api \
|
||||
avalon-framework-impl \
|
||||
commons-io \
|
||||
commons-logging \
|
||||
fontbox \
|
||||
glassfish-servlet-api \
|
||||
xml-commons-apis \
|
||||
xml-commons-apis-ext \
|
||||
batik-all \
|
||||
xmlgraphics-commons \
|
||||
qdox
|
||||
|
||||
export CLASSPATH= LANG=en_US.UTF-8
|
||||
ant \
|
||||
%{ant} \
|
||||
-Djavac.source=1.8 -Djavac.target=1.8 \
|
||||
package
|
||||
|
||||
@ -169,7 +174,7 @@ for m in *.1.gz; do
|
||||
done
|
||||
popd
|
||||
|
||||
%files
|
||||
%files -f .mfiles
|
||||
%license LICENSE
|
||||
%doc NOTICE README known-issues.xml
|
||||
%doc *.html
|
||||
@ -180,14 +185,7 @@ popd
|
||||
%{_bindir}/%{bname}-fontmetrics
|
||||
%attr(0755,root,root) %{_bindir}/%{name}-fontlist
|
||||
%{_bindir}/%{bname}-fontlist
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_datadir}/%{name}
|
||||
%{_mavenpomdir}/*
|
||||
%if %{defined _maven_repository}
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
%else
|
||||
%{_datadir}/maven-metadata/%{name}.xml*
|
||||
%endif
|
||||
%{_mandir}/man1/*
|
||||
%config(noreplace) %{_sysconfdir}/fop.xconf
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user