rpms/batik
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 1.10

Browse Source 
- Use Recommends for jai-imageio-core (needed for TIFF support)
This commit is contained in:
Michael Simacek 2018-05-28 13:10:00 +02:00
parent d9f593e8d8
commit b673db992b
4 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ batik-1.7-orbit-manifests.tar.gz
/batik-repack-1.8.zip
/batik-src-1.8.zip
/batik-src-1.9.zip
/batik-src-1.10.zip

26
0001-Fix-imageio-codec-lookup.patch
View File

@ -1,18 +1,17 @@
From 6914031a6c71d88f2577deb3377300f3280bcce3 Mon Sep 17 00:00:00 2001
From 02e469f660450b37300984ad7ac258dfa0111baa Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Fri, 27 Nov 2015 15:35:57 +0100
Subject: [PATCH] Fix imageio codec lookup
---
.../src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java | 2 +-
.../src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
.../java/org/apache/batik/transcoder/image/PNGTranscoder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
index 6db21a9..4bb2d0d 100644
index c25804e..7ea8c26 100644
--- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
+++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/PNGTranscoder.java
@@ -111,7 +111,7 @@ public class PNGTranscoder extends ImageTranscoder {
@@ -116,7 +116,7 @@ public class PNGTranscoder extends ImageTranscoder {
"org.apache.batik.ext.awt.image.codec.png.PNGTranscoderInternalCodecWriteAdapter");
if (adapter == null) {
adapter = getWriteAdapter(
@ -21,19 +20,6 @@ index 6db21a9..4bb2d0d 100644
}
if (adapter == null) {
throw new TranscoderException(
diff --git a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java
index 2cb5288..bb48dfa 100644
--- a/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java
+++ b/batik-transcoder/src/main/java/org/apache/batik/transcoder/image/TIFFTranscoder.java
@@ -104,7 +104,7 @@ public class TIFFTranscoder extends ImageTranscoder {
"org.apache.batik.ext.awt.image.codec.tiff.TIFFTranscoderInternalCodecWriteAdapter");
if (adapter == null) {
adapter = getWriteAdapter(
- "org.apache.batik.transcoder.image.TIFFTranscoderImageIOWriteAdapter");
+ "org.apache.batik.ext.awt.image.codec.imageio.TIFFTranscoderImageIOWriteAdapter");
}
if (adapter == null) {
throw new TranscoderException(
--
2.9.3
2.17.0

16
batik.spec
View File

@ -1,8 +1,8 @@
%global classpath batik:rhino:xml-commons-apis:xml-commons-apis-ext:xmlgraphics-commons:jai_imageio
Name: batik
Version: 1.9
Release: 7%{?dist}
Version: 1.10
Release: 1%{?dist}
Summary: Scalable Vector Graphics for Java
License: ASL 2.0 and W3C
URL: https://xmlgraphics.apache.org/batik/
@ -26,7 +26,7 @@ BuildRequires: mvn(xml-apis:xml-apis)
BuildRequires: mvn(xml-apis:xml-apis-ext)
# full support for tiff
Requires: jai-imageio-core
Recommends: jai-imageio-core
%description
Batik is a Java(tm) technology based toolkit for applications that want
@ -105,9 +105,6 @@ find -name '*.jar' -exec rm -f '{}' \;
cp -p %{SOURCE1} batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
cp -p %{SOURCE1} batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
# We don't want a dependency
%pom_xpath_inject 'pom:dependency[pom:artifactId="jython"]' '<optional>true</optional>' batik-script
# It's an uberjar, it shouldn't have requires
%pom_xpath_inject pom:dependency '<optional>true</optional>' batik-all
@ -133,6 +130,8 @@ done
# for eclipse
%pom_xpath_set pom:Bundle-SymbolicName org.apache.batik.util.gui batik-gui-util
%pom_disable_module batik-test-old
%mvn_package :batik-squiggle squiggle
%mvn_package :batik-squiggle-ext squiggle
%mvn_package :batik-svgpp svgpp
@ -141,6 +140,7 @@ done
%mvn_package :batik-rasterizer-ext rasterizer
%mvn_package :batik-slideshow slideshow
%mvn_package :batik-css css
%mvn_package ':batik-test*' __noinstall
%mvn_file :batik-all batik-all
@ -190,6 +190,10 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%changelog
* Mon May 28 2018 Michael Simacek <msimacek@redhat.com> - 1.10-1
- Update to upstream version 1.10
- Use Recommends for jai-imageio-core (needed for TIFF support)
* Wed Apr 25 2018 Mat Booth <mat.booth@redhat.com> - 1.9-7
- Generate correct OSGi metadata

2
sources
View File

@ -1 +1 @@
SHA512 (batik-src-1.9.zip) = 8c1e8764ed96436951241fd8d0b3bcc336fe4c2b7efe0c291e9bf2293cd9ffd03520baabb946f814e9081177e6c97e9379b7e73f776724724745d2adf3a4abab
SHA512 (batik-src-1.10.zip) = c62c04b9006bcccff4ebf552d22c873e0c19a00990cd639b0e1e299f335d7fdb11b5db07bb94c9f6223be9e06f8fb20da5a5b9b8555dbc0bccdb9ed3921d106f