Sync from SUSE:SLFO:Main xmlgraphics-commons revision ab14363fc4282aec28be60cbfefe2cb7

This commit is contained in:
Adrian Schröter 2024-05-04 02:10:22 +02:00
commit a472e2de7f
6 changed files with 325 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

BIN
xmlgraphics-commons-2.8-src.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,45 @@
--- build.xml 2018-05-14 11:00:43.000000000 +0200
+++ build.xml 2020-04-03 14:37:25.091265000 +0200
@@ -251,7 +251,17 @@
<attribute name="Implementation-Title" value="${Name}"/>
<attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/)"/>
- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
+ <attribute name="Bundle-Description" value="${Name}"/>
+ <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+ <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-Name" value="org.apache.xmlgraphics:${name}"/>
+ <attribute name="Bundle-SymbolicName" value="org.apache.xmlgraphics"/>
+ <attribute name="Bundle-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/)"/>
+ <attribute name="Bundle-Version" value="${version}.0"/>
+ <attribute name="Export-Package" value="org.apache.xmlgraphics.util.i18n;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.util;uses:=&quot;javax.imageio.metadata,org.w3c.dom,org.xml.sax&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.util.io;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.util.uri;uses:=&quot;javax.xml.transform&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.util.dijkstra;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.xmp;uses:=&quot;javax.xml.transform,org.apache.xmlgraphics.util,org.apache.xmlgraphics.xmp.merge,org.xml.sax,org.xml.sax.helpers&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.xmp.schemas;uses:=&quot;org.apache.xmlgraphics.util,org.apache.xmlgraphics.xmp,org.apache.xmlgraphics.xmp.merge&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.xmp.schemas.pdf;uses:=&quot;org.apache.xmlgraphics.xmp,org.apache.xmlgraphics.xmp.merge&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.xmp.merge;uses:=&quot;org.apache.xmlgraphics.util,org.apache.xmlgraphics.xmp&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.io;uses:=&quot;javax.xml.transform&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.codec.util;uses:=&quot;javax.imageio.stream&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.codec.png;uses:=&quot;javax.imageio.stream,org.apache.commons.logging,org.apache.xmlgraphics.image.codec.util,org.apache.xmlgraphics.image.loader,org.apache.xmlgraphics.image.rendered&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.codec.tiff;uses:=&quot;org.apache.xmlgraphics.image.codec.util,org.apache.xmlgraphics.image.rendered&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.loader.util;uses:=&quot;javax.imageio.stream,javax.xml.transform,org.apache.xmlgraphics.image.codec.util,org.apache.xmlgraphics.image.loader&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.loader;uses:=&quot;javax.imageio.stream,javax.xml.transform,org.apache.commons.logging,org.apache.xmlgraphics.image.loader.cache,org.apache.xmlgraphics.image.loader.pipeline,org.apache.xmlgraphics.image.loader.spi&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.loader.spi;uses:=&quot;javax.xml.transform,org.apache.commons.logging,org.apache.xmlgraphics.image.loader,org.apache.xmlgraphics.image.loader.util&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.loader.cache;uses:=&quot;org.apache.commons.logging,org.apache.xmlgraphics.image.loader&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.loader.pipeline;uses:=&quot;org.apache.commons.logging,org.apache.xmlgraphics.image.loader,org.apache.xmlgraphics.image.loader.cache,org.apache.xmlgraphics.image.loader.spi,org.apache.xmlgraphics.image.loader.util,org.apache.xmlgraphics.util.dijkstra&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.rendered;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.writer;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image.writer.imageio;uses:=&quot;javax.imageio,javax.imageio.event,javax.imageio.metadata,org.apache.xmlgraphics.image.writer,org.w3c.dom&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.image;uses:=&quot;org.apache.xmlgraphics.image.rendered&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.java2d;uses:=&quot;org.apache.xmlgraphics.ps&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.java2d.ps;uses:=&quot;org.apache.xmlgraphics.java2d,org.apache.xmlgraphics.ps&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.java2d.color;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.java2d.color.profile;uses:=&quot;org.apache.xmlgraphics.java2d.color&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.fonts;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.ps.dsc;uses:=&quot;org.apache.xmlgraphics.ps,org.apache.xmlgraphics.ps.dsc.events&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.ps.dsc.events;uses:=&quot;org.apache.xmlgraphics.ps,org.apache.xmlgraphics.ps.dsc&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.ps.dsc.tools;uses:=&quot;org.apache.xmlgraphics.ps,org.apache.xmlgraphics.ps.dsc,org.apache.xmlgraphics.ps.dsc.events&quot;;version=&quot;${version}.0&quot;,org.apache.xmlgraphics.ps;uses:=&quot;javax.xml.transform,org.apache.xmlgraphics.ps.dsc&quot;;version=&quot;${version}.0&quot;"/>
+ <attribute name="Import-Package" value="javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stream,org.apache.commons.io;version=&quot;[1.4,2)&quot;,org.apache.commons.io.output;version=&quot;[1.4,2)&quot;,org.apache.commons.logging;version=&quot;[1.2,2)&quot;,org.apache.xmlgraphics.fonts,org.apache.xmlgraphics.image,org.apache.xmlgraphics.image.codec.tiff,org.apache.xmlgraphics.image.codec.util,org.apache.xmlgraphics.image.loader,org.apache.xmlgraphics.image.loader.cache,org.apache.xmlgraphics.image.loader.spi,org.apache.xmlgraphics.image.loader.util,org.apache.xmlgraphics.image.rendered,org.apache.xmlgraphics.image.writer,org.apache.xmlgraphics.io,org.apache.xmlgraphics.java2d,org.apache.xmlgraphics.java2d.color,org.apache.xmlgraphics.java2d.color.profile,org.apache.xmlgraphics.ps,org.apache.xmlgraphics.ps.dsc,org.apache.xmlgraphics.ps.dsc.events,org.apache.xmlgraphics.ps.dsc.tools,org.apache.xmlgraphics.util,org.apache.xmlgraphics.util.dijkstra,org.apache.xmlgraphics.util.i18n,org.apache.xmlgraphics.util.io,org.apache.xmlgraphics.xmp,org.apache.xmlgraphics.xmp.merge,org.apache.xmlgraphics.xmp.schemas,org.apache.xmlgraphics.xmp.schemas.pdf,org.w3c.dom,org.xml.sax,org.xml.sax.helpers"/>
+ <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${javac.target}))&quot;"/>
</manifest>
<metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
</jar>
@@ -357,20 +367,13 @@
</target>
<target name="junit" depends="junit-basic" description="Runs all JUnit tests" if="junit.present">
- <fail>
- <condition>
- <or>
- <isset property="test.junit.error"/>
- <isset property="test.junit.failure"/>
- </or>
- </condition>
+ <echo>
NOTE:
**************************************************************************
-* One or more of the Junit tests had Failures or Errors or were skipped! *
+* One or more of the Junit tests MAY have had Failures or Errors or were skipped! *
* Please check the output above for relevant messages. *
**************************************************************************
- </fail>
- <echo>All Junit tests passed!</echo>
+ </echo>
</target>
<!-- =================================================================== -->

View File

@ -0,0 +1,10 @@
--- xmlgraphics-commons-2.1/build.xml 2016-01-07 14:46:18.000000000 +0100
+++ xmlgraphics-commons-2.1/build.xml 2017-12-22 14:35:12.045945039 +0100
@@ -402,7 +402,6 @@
source="${javac.source}">
<header><![CDATA[${name} ${version}]]></header>
<footer><![CDATA[${name} ${version}]]></footer>
- <link offline="false" href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
<classpath>
<path refid="libs-build-classpath"/>
<pathelement path="${java.class.path}"/>

157
xmlgraphics-commons.changes Normal file
View File

@ -0,0 +1,157 @@
-------------------------------------------------------------------
Wed Dec 28 12:37:08 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 2.8:
* Minor changes to support FOP 2.8 release
-------------------------------------------------------------------
Fri Mar 18 17:52:48 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source/target levels 8
-------------------------------------------------------------------
Sun Jan 24 18:23:07 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Update to version 2.6:
* fixes bsc#1182754, CVE-2020-11988
* minor release
* changes:
+ Fix test on Windows
+ XGC-122: Dont load DTDs in XMP
+ XGC-123: Decode image at page load rather than document load
-------------------------------------------------------------------
Thu Jun 4 05:05:24 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Update to version 2.4:
* minor release
* no changelog available
-------------------------------------------------------------------
Fri Apr 3 12:42:45 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* xmlgraphics-commons-build_xml.patch
+ improve a bit more the OSGi manifest to be able to use it
from eclipse
-------------------------------------------------------------------
Sat Jan 19 08:03:42 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* xmlgraphics-commons-build_xml.patch
+ Add Bundle-SymbolicName and Bundle-Version attributes to
generate the right OSGi provides
- Sanitize spec file and remove unused requires
-------------------------------------------------------------------
Tue Aug 28 13:44:48 UTC 2018 - tchvatal@suse.com
- Do not run target maven_artifacts as it just copies file from a->b
and fails with newer ant
-------------------------------------------------------------------
Tue Aug 28 13:12:00 UTC 2018 - tchvatal@suse.com
- Update to version 2.3:
* no changelog available
-------------------------------------------------------------------
Fri Dec 22 13:37:24 UTC 2017 - fstrba@suse.com
- Added patch:
* xmlgraphics-commons-jdk10.patch
+ Fix building with jdk10
-------------------------------------------------------------------
Fri Sep 29 08:43:00 UTC 2017 - fstrba@suse.com
- Don't condition the maven defines on release version, but on
_maven_repository being defined
-------------------------------------------------------------------
Tue Sep 19 07:32:15 UTC 2017 - fstrba@suse.com
- Fix build with jdk9: specify java source and target level 1.6
-------------------------------------------------------------------
Fri May 19 11:03:58 UTC 2017 - vsistek@suse.com
- Add BuildRequires: javapackages-local (for maven conversions)
-------------------------------------------------------------------
Mon Mar 20 15:20:21 UTC 2017 - sknorr@suse.com
- Needed as a dependency for FOP 2.1 (FATE#322405)
- Switch between maven-metadata/maven-fragments as appropriate
for SLE/openSUSE
-------------------------------------------------------------------
Mon Mar 6 09:54:30 UTC 2017 - sknorr@suse.com
- Switch between maven-metadata/maven-fragments as appropriate
for SLE/openSUSE (FATE#322405)
-------------------------------------------------------------------
Thu Mar 3 11:27:53 UTC 2016 - fvogt@suse.com
- Update to version 2.1
- No changelog available
-------------------------------------------------------------------
Wed Mar 18 09:46:25 UTC 2015 - tchvatal@suse.com
- Fix build with new javapackages-tools
-------------------------------------------------------------------
Fri Dec 5 12:35:21 UTC 2014 - p.drouand@gmail.com
- Update to version 2.0
+ No changelog available
- Do not use gpg_verify anymore; OBS handles source verification
- Remove dependency on java-devel
-------------------------------------------------------------------
Mon Sep 9 11:06:29 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
-------------------------------------------------------------------
Fri Sep 6 07:55:29 UTC 2013 - mvyskocil@suse.com
- format spec file
- use new add_maven_depmap macro
- build require apache-commons packages
- add gpg verification
-------------------------------------------------------------------
Wed Jan 23 09:27:51 UTC 2013 - mvyskocil@suse.com
- fix javadoc installation
-------------------------------------------------------------------
Wed Oct 31 08:28:00 UTC 2012 - mvyskocil@suse.com
- remove the symlink madness - jar and javadoc are not versioned anymore
-------------------------------------------------------------------
Wed Oct 24 10:13:01 UTC 2012 - mvyskocil@suse.com
- update to 1.5
* bug fix release
* improved code practices
* improved coverage of CCITTFax Group 3 image formats
* removed com.sun classes usage
* see http://xmlgraphics.apache.org/commons/changes.html#version_1.5
* drop upstreamed java7 patch
-------------------------------------------------------------------
Mon Jun 18 13:46:01 UTC 2012 - mvyskocil@suse.cz
- fix jdk7 build (Fedora patch)
-------------------------------------------------------------------
Wed Nov 3 13:47:59 UTC 2010 - mvyskocil@suse.cz
- Initial packaging for SUSE (xmlgraphics-commons-1.3.1-2.jpp5.src.rpm)

87
xmlgraphics-commons.spec Normal file
View File

@ -0,0 +1,87 @@
#
# spec file for package xmlgraphics-commons
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2000-2008, JPackage Project
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: xmlgraphics-commons
Version: 2.8
Release: 0
Summary: XML Graphics Commons
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://xmlgraphics.apache.org/commons/
Source0: https://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
Patch0: xmlgraphics-commons-build_xml.patch
Patch1: xmlgraphics-commons-jdk10.patch
BuildRequires: ant >= 1.6.5
BuildRequires: commons-io >= 1.1
BuildRequires: commons-logging
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
Requires: mvn(commons-io:commons-io) >= 1.1
Requires: mvn(commons-logging:commons-logging)
BuildArch: noarch
%description
Apache XML Graphics Commons is a library that consists of
several reusable components used by Apache Batik and
Apache FOP. Many of these components can easily be used
separately outside the domains of SVG and XSL-FO. You will
find components such as a PDF library, an RTF library,
Graphics2D implementations that let you generate PDF &
PostScript files, and much more.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation/HTML
%description javadoc
Javadoc for package %{name}.
%prep
%setup -q %{name}-%{version}
%patch0
%patch1 -p1
find . -name "*.jar" | xargs rm
%build
export CLASSPATH=
build-jar-repository -s lib commons-io commons-logging
ant -Djavac.source=1.8 -Djavac.target=1.8 package javadocs
%install
# jar
install -Dpm 644 build/%{name}-%{version}.jar \
%{buildroot}%{_javadir}/%{name}.jar
# pom
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
%license LICENSE NOTICE
%doc README
%files javadoc
%license LICENSE NOTICE
%{_javadocdir}/%{name}
%changelog