From f8b7fe596e43daa7e4d4439e2f76906ba0fd9766 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:56:21 +0000
Subject: [PATCH 01/55] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 3fe025e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmlgraphics-commons
-# $Id$
-NAME := xmlgraphics-commons
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From 566f410286df14ebb3851e39a7e2177425a454df Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Fri, 1 Oct 2010 09:50:04 +0300
Subject: [PATCH 02/55] Update to 1.4.

---
 sources                  |  2 +-
 xmlgraphics-commons.spec | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sources b/sources
index 18f8c94..ce1b97e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4dcac6600df8282685be6972bf9b4de4  xmlgraphics-commons-1.3.1-src.tar.gz
+d2b56a1671d2ca63480e38acd9629ea7  xmlgraphics-commons-1.4-src.tar.gz
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 56fe573..940c0a6 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,5 +1,5 @@
 Name:           xmlgraphics-commons
-Version:        1.3.1
+Version:        1.4
 Release:        1
 Epoch:          0
 Summary:        XML Graphics Commons
@@ -12,15 +12,15 @@ Source0:        http://apache.skknet.net/xmlgraphics/commons/source/%{name}-%{ve
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  java-1.6.0-openjdk-devel >= 1:1.6.0.0-0.7
+BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit
-BuildRequires:  jakarta-commons-io >= 0:1.1
-BuildRequires:  jakarta-commons-logging >= 0:1.0.4
-Requires:	jakarta-commons-logging >= 0:1.0.4
-Requires:       jakarta-commons-io >= 0:1.1
+BuildRequires:  apache-commons-io >= 0:1.1
+BuildRequires:  apache-commons-logging >= 0:1.0.4
+Requires:	    apache-commons-logging >= 0:1.0.4
+Requires:       apache-commons-io >= 0:1.1
 
 %description
 Apache XML Graphics Commons is a library that consists of 
@@ -34,6 +34,7 @@ PostScript files, and much more.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description    javadoc
 %{summary}.
@@ -45,9 +46,7 @@ rm -f `find . -name "*.jar"`
 
 
 %build
-export ANT_HOME=/usr/share/ant
-export JAVA_HOME=/usr/lib/jvm/java-openjdk
-export CLASSPATH=$CLASSPATH:/usr/share/java/commons-logging.jar
+export CLASSPATH=$(build-classpath commons-logging)
 export OPT_JAR_LIST="ant/ant-junit junit"
 pushd lib
 ln -sf $(build-classpath commons-io) .
@@ -77,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.4-1
+- Updte to 1.4.
+
 * Sat Jan 9 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.3.1-1
 - Update to 1.3.1.
 - Fix Source0 url.

From c7de44171e391ba7d314631e894b6bab5d2d7182 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Mon, 7 Feb 2011 23:31:17 -0600
Subject: [PATCH 03/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 940c0a6..c865b3c 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.4
-Release:        1
+Release:        2
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.4-1
 - Updte to 1.4.
 

From 64381cf8057699638b13abe24634cfa306a1f85f Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Tue, 3 May 2011 15:41:43 +0200
Subject: [PATCH 04/55] Install maven metadata

- Versionless jars & javadocs
- Fixes according to new guidelines
---
 xmlgraphics-commons.spec | 55 +++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index c865b3c..827a860 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.4
-Release:        2
+Release:        3
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -9,8 +9,6 @@ License:        ASL 2.0
 URL:            http://xmlgraphics.apache.org/
 Source0:        http://apache.skknet.net/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.6
@@ -19,16 +17,18 @@ BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit
 BuildRequires:  apache-commons-io >= 0:1.1
 BuildRequires:  apache-commons-logging >= 0:1.0.4
-Requires:	    apache-commons-logging >= 0:1.0.4
+Requires:       apache-commons-logging >= 0:1.0.4
 Requires:       apache-commons-io >= 0:1.1
+Requires(post):   jpackage-utils
+Requires(postun): jpackage-utils
 
 %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 & 
+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
@@ -44,6 +44,10 @@ Requires:       jpackage-utils
 %setup -q %{name}-%{version}
 rm -f `find . -name "*.jar"`
 
+# create pom from template
+sed "s:@version@:%{version}:g" %{name}-pom-template.pom \
+    > %{name}.pom
+
 
 %build
 export CLASSPATH=$(build-classpath commons-logging)
@@ -54,28 +58,37 @@ popd
 ant package javadocs
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -Dpm 0644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -Dpm 0644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -pm 644 %{name}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap org.apache.xmlgraphics %{name} %{version} JPP %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE NOTICE README
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-%{name}.pom
 %{_javadir}/*.jar
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
+%doc LICENSE NOTICE
 %doc %{_javadocdir}/%{name}
 
 
 %changelog
+* Tue May  3 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-3
+- Install maven metadata
+- Versionless jars & javadocs
+- Fixes according to new guidelines
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 5ae1458d0c3cd24e03a944dc9d0b912de669cdec Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 14 Jan 2012 03:03:55 -0600
Subject: [PATCH 05/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 827a860..e6d02a9 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.4
-Release:        3
+Release:        4
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -84,6 +84,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue May  3 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-3
 - Install maven metadata
 - Versionless jars & javadocs

From c24583ded421c6d0a9a21db15c8ae54bac5778c7 Mon Sep 17 00:00:00 2001
From: Deepak Bhole <dbhole@redhat.com>
Date: Thu, 1 Mar 2012 17:25:18 -0500
Subject: [PATCH 06/55] - Resolves: rhbz#796341 - Added
 xmlgraphics-commons-java-7-fix.patch to fix build with Java 7

---
 xmlgraphics-commons-java-7-fix.patch | 1052 ++++++++++++++++++++++++++
 xmlgraphics-commons.spec             |    8 +-
 2 files changed, 1059 insertions(+), 1 deletion(-)
 create mode 100644 xmlgraphics-commons-java-7-fix.patch

diff --git a/xmlgraphics-commons-java-7-fix.patch b/xmlgraphics-commons-java-7-fix.patch
new file mode 100644
index 0000000..cc83a93
--- /dev/null
+++ b/xmlgraphics-commons-java-7-fix.patch
@@ -0,0 +1,1052 @@
+diff -r 5073426893de xmlgraphics-commons-1.4/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java
+--- src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java	Tue Feb 21 12:29:55 2012 +0100
++++ src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java	Tue Feb 21 12:50:48 2012 +0100
+@@ -15,7 +15,7 @@
+  * limitations under the License.
+  */
+ 
+-/* $Id: TIFFImage.java 750418 2009-03-05 11:03:54Z vhennebert $ */
++/* $Id$ */
+ 
+ package org.apache.xmlgraphics.image.codec.tiff;
+ 
+@@ -35,7 +35,6 @@
+ import java.awt.image.Raster;
+ import java.awt.image.SampleModel;
+ import java.awt.image.WritableRaster;
+-import java.io.ByteArrayInputStream;
+ import java.io.IOException;
+ import java.util.HashMap;
+ import java.util.Map;
+@@ -46,10 +45,6 @@
+ import org.apache.xmlgraphics.image.rendered.AbstractRed;
+ import org.apache.xmlgraphics.image.rendered.CachableRed;
+ 
+-import com.sun.image.codec.jpeg.JPEGCodec;
+-import com.sun.image.codec.jpeg.JPEGDecodeParam;
+-import com.sun.image.codec.jpeg.JPEGImageDecoder;
+-
+ public class TIFFImage extends AbstractRed {
+ 
+     // Compression types
+@@ -101,10 +96,6 @@
+     // LZW compression related variable
+     int predictor;
+ 
+-    // TTN2 JPEG related variables
+-    JPEGDecodeParam decodeParam = null;
+-    boolean colorConvertJPEG = false;
+-
+     // DEFLATE variables
+     Inflater inflater = null;
+ 
+@@ -123,46 +114,6 @@
+     private TIFFLZWDecoder lzwDecoder = null;
+ 
+     /**
+-     * Decode a buffer of data into a Raster with the specified location.
+-     *
+-     * @param data buffer contain an interchange or abbreviated datastream.
+-     * @param decodeParam decoding parameters; may be null unless the
+-     *        data buffer contains an abbreviated datastream in which case
+-     *        it may not be null or an error will occur.
+-     * @param colorConvert whether to perform color conversion; in this
+-     *        case that would be limited to YCbCr-to-RGB.
+-     * @param minX the X position of the returned Raster.
+-     * @param minY the Y position of the returned Raster.
+-     */
+-    private static final Raster decodeJPEG(byte[] data,
+-                                           JPEGDecodeParam decodeParam,
+-                                           boolean colorConvert,
+-                                           int minX,
+-                                           int minY) {
+-        // Create an InputStream from the compressed data array.
+-        ByteArrayInputStream jpegStream = new ByteArrayInputStream(data);
+-
+-        // Create a decoder.
+-        JPEGImageDecoder decoder = decodeParam == null ?
+-            JPEGCodec.createJPEGDecoder(jpegStream) :
+-            JPEGCodec.createJPEGDecoder(jpegStream,
+-                                        decodeParam);
+-
+-        // Decode the compressed data into a Raster.
+-        Raster jpegRaster;
+-        try {
+-            jpegRaster = colorConvert ?
+-                decoder.decodeAsBufferedImage().getWritableTile(0, 0) :
+-                decoder.decodeAsRaster();
+-        } catch (IOException ioe) {
+-            throw new RuntimeException("TIFFImage13");
+-        }
+-
+-        // Translate the decoded Raster to the specified location and return.
+-        return jpegRaster.createTranslatedChild(minX, minY);
+-    }
+-
+-    /**
+      * Inflates <code>deflated</code> into <code>inflated</code> using the
+      * <code>Inflater</code> constructed during class instantiation.
+      */
+@@ -170,8 +121,8 @@
+         inflater.setInput(deflated);
+         try {
+             inflater.inflate(inflated);
+-        } catch(DataFormatException dfe) {
+-            throw new RuntimeException("TIFFImage17"+": "+
++        } catch (DataFormatException dfe) {
++            throw new RuntimeException("TIFFImage17" + ": " +
+                                        dfe.getMessage());
+         }
+         inflater.reset();
+@@ -180,26 +131,27 @@
+     private static SampleModel createPixelInterleavedSampleModel
+         (int dataType, int tileWidth, int tileHeight, int bands) {
+         int [] bandOffsets = new int[bands];
+-        for (int i=0; i<bands; i++)
++        for (int i = 0; i < bands; i++) {
+             bandOffsets[i] = i;
++        }
+         return new PixelInterleavedSampleModel
+             (dataType, tileWidth, tileHeight, bands,
+-             tileWidth*bands, bandOffsets);
++             tileWidth * bands, bandOffsets);
+     }
+ 
+     /**
+      * Return as a long[] the value of a TIFF_LONG or TIFF_SHORT field.
+      */
+-    private final long[] getFieldAsLongs(TIFFField field) {
++    private long[] getFieldAsLongs(TIFFField field) {
+         long[] value = null;
+ 
+-        if(field.getType() == TIFFField.TIFF_SHORT) {
++        if (field.getType() == TIFFField.TIFF_SHORT) {
+             char[] charValue = field.getAsChars();
+             value = new long[charValue.length];
+-            for(int i = 0; i < charValue.length; i++) {
+-                value[i] = charValue[i]  & 0xffff;
++            for (int i = 0; i < charValue.length; i++) {
++                value[i] = charValue[i] & 0xffff;
+             }
+-        } else if(field.getType() == TIFFField.TIFF_LONG) {
++        } else if (field.getType() == TIFFField.TIFF_LONG) {
+             value = field.getAsLongs();
+         } else {
+             throw new RuntimeException();
+@@ -255,7 +207,7 @@
+             TIFFField bitsField =
+                 dir.getField(TIFFImageDecoder.TIFF_BITS_PER_SAMPLE);
+             char[] bitsPerSample = null;
+-            if(bitsField != null) {
++            if (bitsField != null) {
+                 bitsPerSample = bitsField.getAsChars();
+             } else {
+                 bitsPerSample = new char[] {1};
+@@ -279,7 +231,7 @@
+                 sampleFormat = sampleFormatField.getAsChars();
+ 
+                 // Check that all the samples have the same format
+-                for (int l=1; l<sampleFormat.length; l++) {
++                for (int l = 1; l < sampleFormat.length; l++) {
+                     if (sampleFormat[l] != sampleFormat[0]) {
+                         throw new RuntimeException("TIFFImage2");
+                     }
+@@ -291,34 +243,34 @@
+ 
+             // Set the data type based on the sample size and format.
+             boolean isValidDataFormat = false;
+-            switch(sampleSize) {
++            switch (sampleSize) {
+             case 1:
+             case 4:
+             case 8:
+-                if(sampleFormat[0] != 3) {
++                if (sampleFormat[0] != 3) {
+                     // Ignore whether signed or unsigned: treat all as unsigned.
+                     dataType = DataBuffer.TYPE_BYTE;
+                     isValidDataFormat = true;
+                 }
+                 break;
+             case 16:
+-                if(sampleFormat[0] != 3) {
++                if (sampleFormat[0] != 3) {
+                     dataType = sampleFormat[0] == 2 ?
+                         DataBuffer.TYPE_SHORT : DataBuffer.TYPE_USHORT;
+                     isValidDataFormat = true;
+                 }
+                 break;
+             case 32:
+-              if (sampleFormat[0] == 3)
++              if (sampleFormat[0] == 3) {
+                 isValidDataFormat = false;
+-              else {
++            } else {
+                 dataType = DataBuffer.TYPE_INT;
+                 isValidDataFormat = true;
+               }
+               break;
+             }
+ 
+-            if(!isValidDataFormat) {
++            if (!isValidDataFormat) {
+                 throw new RuntimeException("TIFFImage3");
+             }
+ 
+@@ -342,11 +294,11 @@
+             case 0: // WhiteIsZero
+                 isWhiteZero = true;
+             case 1: // BlackIsZero
+-                if(sampleSize == 1 && samplesPerPixel == 1) {
++                if (sampleSize == 1 && samplesPerPixel == 1) {
+                     imageType = TYPE_BILEVEL;
+-                } else if(sampleSize == 4 && samplesPerPixel == 1) {
++                } else if (sampleSize == 4 && samplesPerPixel == 1) {
+                     imageType = TYPE_GRAY_4BIT;
+-                } else if(sampleSize % 8 == 0) {
++                } else if (sampleSize % 8 == 0) {
+                     if(samplesPerPixel == 1) {
+                         imageType = TYPE_GRAY;
+                     } else if(samplesPerPixel == 2) {
+@@ -357,10 +309,10 @@
+                 }
+                 break;
+             case 2: // RGB
+-                if(sampleSize % 8 == 0) {
+-                    if(samplesPerPixel == 3) {
++                if (sampleSize % 8 == 0) {
++                    if (samplesPerPixel == 3) {
+                         imageType = TYPE_RGB;
+-                    } else if(samplesPerPixel == 4) {
++                    } else if (samplesPerPixel == 4) {
+                         imageType = TYPE_RGB_ALPHA;
+                     } else {
+                         imageType = TYPE_GENERIC;
+@@ -368,48 +320,24 @@
+                 }
+                 break;
+             case 3: // RGB Palette
+-                if(samplesPerPixel == 1 &&
++                if (samplesPerPixel == 1 &&
+                    (sampleSize == 4 || sampleSize == 8 || sampleSize == 16)) {
+                     imageType = TYPE_PALETTE;
+                 }
+                 break;
+             case 4: // Transparency mask
+-                if(sampleSize == 1 && samplesPerPixel == 1) {
++                if (sampleSize == 1 && samplesPerPixel == 1) {
+                     imageType = TYPE_BILEVEL;
+                 }
+                 break;
+-            case 6: // YCbCr
+-                if(compression == COMP_JPEG_TTN2 &&
+-                   sampleSize == 8 && samplesPerPixel == 3) {
+-                    // Set color conversion flag.
+-                    colorConvertJPEG = param.getJPEGDecompressYCbCrToRGB();
+-
+-                    // Set type to RGB if color converting.
+-                    imageType = colorConvertJPEG ? TYPE_RGB : TYPE_GENERIC;
+-                } else {
+-                    TIFFField chromaField = dir.getField(TIFF_YCBCR_SUBSAMPLING);
+-                    if(chromaField != null) {
+-                        chromaSubH = chromaField.getAsInt(0);
+-                        chromaSubV = chromaField.getAsInt(1);
+-                    } else {
+-                        chromaSubH = chromaSubV = 2;
+-                    }
+-
+-                    if(chromaSubH*chromaSubV == 1) {
+-                        imageType = TYPE_GENERIC;
+-                    } else if(sampleSize == 8 && samplesPerPixel == 3) {
+-                        imageType = TYPE_YCBCR_SUB;
+-                    }
+-                }
+-                break;
+             default: // Other including CMYK, CIE L*a*b*, unknown.
+-                if(sampleSize % 8 == 0) {
++                if (sampleSize % 8 == 0) {
+                     imageType = TYPE_GENERIC;
+                 }
+             }
+ 
+             // Bail out if not one of the supported types.
+-            if(imageType == TYPE_UNSUPPORTED) {
++            if (imageType == TYPE_UNSUPPORTED) {
+                 throw new RuntimeException("TIFFImage4");
+             }
+ 
+@@ -490,8 +418,8 @@
+             }
+ 
+             // Calculate number of tiles and the tileSize in bytes
+-            tilesX = (bounds.width + tileWidth - 1)/tileWidth;
+-            tilesY = (bounds.height + tileHeight - 1)/tileHeight;
++            tilesX = (bounds.width + tileWidth - 1) / tileWidth;
++            tilesY = (bounds.height + tileHeight - 1) / tileHeight;
+             tileSize = tileWidth * tileHeight * numBands;
+ 
+             // Check whether big endian or little endian format is used.
+@@ -517,7 +445,7 @@
+             case COMP_FAX_G3_1D:
+             case COMP_FAX_G3_2D:
+             case COMP_FAX_G4_2D:
+-                if(sampleSize != 1) {
++                if (sampleSize != 1) {
+                     throw new RuntimeException("TIFFImage7");
+                 }
+ 
+@@ -577,29 +505,9 @@
+             case COMP_JPEG_OLD:
+                 throw new RuntimeException("TIFFImage15");
+ 
+-            case COMP_JPEG_TTN2:
+-                if(!(sampleSize == 8 &&
+-                     ((imageType == TYPE_GRAY && samplesPerPixel == 1) ||
+-                      (imageType == TYPE_PALETTE && samplesPerPixel == 1) ||
+-                      (imageType == TYPE_RGB && samplesPerPixel == 3)))) {
+-                    throw new RuntimeException("TIFFImage16");
+-                }
+-
+-                // Create decodeParam from JPEGTables field if present.
+-                if(dir.isTagPresent(TIFF_JPEG_TABLES)) {
+-                    TIFFField jpegTableField = dir.getField(TIFF_JPEG_TABLES);
+-                    byte[] jpegTable = jpegTableField.getAsBytes();
+-                    ByteArrayInputStream tableStream =
+-                        new ByteArrayInputStream(jpegTable);
+-                    JPEGImageDecoder decoder =
+-                        JPEGCodec.createJPEGDecoder(tableStream);
+-                    decoder.decodeAsRaster();
+-                    decodeParam = decoder.getJPEGDecodeParam();
+-                }
+-
+-                break;
+             default:
+-                throw new RuntimeException("TIFFImage10");
++                throw new RuntimeException("Compression not supported: " + compression);
++                //throw new RuntimeException("TIFFImage10");
+             }
+ 
+             ColorModel  colorModel  = null;
+@@ -612,18 +520,20 @@
+                                                     tileWidth,
+                                                     tileHeight,
+                                                     sampleSize);
+-                if(imageType == TYPE_BILEVEL) {
++                if (imageType == TYPE_BILEVEL) {
+                     byte[] map = new byte[] {(byte)(isWhiteZero ? 255 : 0),
+                                              (byte)(isWhiteZero ? 0 : 255)};
+                     colorModel = new IndexColorModel(1, 2, map, map, map);
+                 } else {
+                     byte [] map = new byte[16];
+                     if (isWhiteZero) {
+-                        for (int i=0; i<map.length; i++)
+-                            map[i] = (byte)(255-(16*i));
++                        for (int i = 0; i < map.length; i++) {
++                            map[i] = (byte)(255 - (16 * i));
++                        }
+                     } else {
+-                        for (int i=0; i<map.length; i++)
+-                            map[i] = (byte)(16*i);
++                        for (int i = 0; i < map.length; i++) {
++                            map[i] = (byte)(16 * i);
++                        }
+                     }
+                     colorModel = new IndexColorModel(4, 16, map, map, map);
+                 }
+@@ -636,22 +546,22 @@
+                 // Create a pixel interleaved SampleModel with decreasing
+                 // band offsets.
+                 int[] reverseOffsets = new int[numBands];
+-                for (int i=0; i<numBands; i++) {
++                for (int i = 0; i < numBands; i++) {
+                     reverseOffsets[i] = numBands - 1 - i;
+                 }
+                 sampleModel = new PixelInterleavedSampleModel
+                     (dataType, tileWidth, tileHeight,
+-                     numBands, numBands*tileWidth, reverseOffsets);
++                     numBands, numBands * tileWidth, reverseOffsets);
+ 
+-                if(imageType == TYPE_GRAY) {
++                if (imageType == TYPE_GRAY) {
+                   colorModel = new ComponentColorModel
+                     (ColorSpace.getInstance(ColorSpace.CS_GRAY),
+-                     new int[] { sampleSize }, false, false,
++                     new int[] {sampleSize}, false, false,
+                      Transparency.OPAQUE, dataType);
+                 } else if (imageType == TYPE_RGB) {
+                   colorModel = new ComponentColorModel
+                     (ColorSpace.getInstance(ColorSpace.CS_sRGB),
+-                     new int[] { sampleSize, sampleSize, sampleSize },
++                     new int[] {sampleSize, sampleSize, sampleSize},
+                      false, false, Transparency.OPAQUE, dataType);
+                 } else { // hasAlpha
+                     // Transparency.OPAQUE signifies image data that is
+@@ -659,9 +569,9 @@
+                     // value of 1.0. So the extra band gets ignored, which is
+                     // what we want.
+                     int transparency = Transparency.OPAQUE;
+-                    if(extraSamples == 1) { // associated (premultiplied) alpha
++                    if (extraSamples == 1) { // associated (premultiplied) alpha
+                         transparency = Transparency.TRANSLUCENT;
+-                    } else if(extraSamples == 2) { // unassociated alpha
++                    } else if (extraSamples == 2) { // unassociated alpha
+                         transparency = Transparency.BITMASK;
+                     }
+ 
+@@ -680,7 +590,7 @@
+                 // ColorModel as null, as there is no appropriate ColorModel.
+ 
+                 int[] bandOffsets = new int[numBands];
+-                for (int i=0; i<numBands; i++) {
++                for (int i = 0; i < numBands; i++) {
+                     bandOffsets[i] = i;
+                 }
+ 
+@@ -721,7 +631,7 @@
+ 
+                   colorModel = new ComponentColorModel
+                     (ColorSpace.getInstance(ColorSpace.CS_sRGB),
+-                     new int[] { 16, 16, 16 }, false, false,
++                     new int[] {16, 16, 16}, false, false,
+                      Transparency.OPAQUE, dataType);
+ 
+                 } else {
+@@ -753,7 +663,7 @@
+                              numBands);
+                     }
+ 
+-                    int bandLength = colormap.length/3;
++                    int bandLength = colormap.length / 3;
+                     byte[] r = new byte[bandLength];
+                     byte[] g = new byte[bandLength];
+                     byte[] b = new byte[bandLength];
+@@ -763,24 +673,24 @@
+ 
+                     if (dataType == DataBuffer.TYPE_SHORT) {
+ 
+-                        for (int i=0; i<bandLength; i++) {
++                        for (int i = 0; i < bandLength; i++) {
+                             r[i] = param.decodeSigned16BitsTo8Bits
+                                 ((short)colormap[i]);
+                             g[i] = param.decodeSigned16BitsTo8Bits
+-                                ((short)colormap[gIndex+i]);
++                                ((short)colormap[gIndex + i]);
+                             b[i] = param.decodeSigned16BitsTo8Bits
+-                                ((short)colormap[bIndex+i]);
++                                ((short)colormap[bIndex + i]);
+                         }
+ 
+                     } else {
+ 
+-                        for (int i=0; i<bandLength; i++) {
++                        for (int i = 0; i < bandLength; i++) {
+                             r[i] = param.decode16BitsTo8Bits
+                                 (colormap[i] & 0xffff);
+                             g[i] = param.decode16BitsTo8Bits
+-                                (colormap[gIndex+i] & 0xffff);
++                                (colormap[gIndex + i] & 0xffff);
+                             b[i] = param.decode16BitsTo8Bits
+-                                (colormap[bIndex+i] & 0xffff);
++                                (colormap[bIndex + i] & 0xffff);
+                         }
+ 
+                     }
+@@ -838,7 +748,7 @@
+         int[] idata = null;
+ 
+         SampleModel sampleModel = getSampleModel();
+-        WritableRaster tile = makeTile(tileX,tileY);
++        WritableRaster tile = makeTile(tileX, tileY);
+ 
+         DataBuffer buffer = tile.getDataBuffer();
+ 
+@@ -862,21 +772,22 @@
+         long save_offset = 0;
+         try {
+             save_offset = stream.getFilePointer();
+-            stream.seek(tileOffsets[tileY*tilesX + tileX]);
++            stream.seek(tileOffsets[tileY * tilesX + tileX]);
+         } catch (IOException ioe) {
+             throw new RuntimeException("TIFFImage13");
+         }
+ 
+         // Number of bytes in this tile (strip) after compression.
+-        int byteCount = (int)tileByteCounts[tileY*tilesX + tileX];
++        int byteCount = (int)tileByteCounts[tileY * tilesX + tileX];
+ 
+         // Find out the number of bytes in the current tile
+         Rectangle newRect;
+-        if (!tiled)
++        if (!tiled) {
+             newRect = tile.getBounds();
+-        else
++        } else {
+             newRect = new Rectangle(tile.getMinX(), tile.getMinY(),
+                                     tileWidth, tileHeight);
++        }
+ 
+         int unitsInThisTile = newRect.width * newRect.height * numBands;
+ 
+@@ -886,7 +797,7 @@
+ 
+         // Read the data, uncompressing as needed. There are four cases:
+         // bilevel, palette-RGB, 4-bit grayscale, and everything else.
+-        if(imageType == TYPE_BILEVEL) { // bilevel
++        if (imageType == TYPE_BILEVEL) { // bilevel
+             try {
+                 if (compression == COMP_PACKBITS) {
+                     stream.readFully(data, 0, byteCount);
+@@ -895,10 +806,10 @@
+                     // 8 pixels into 1 byte, calculate bytesInThisTile
+                     int bytesInThisTile;
+                     if ((newRect.width % 8) == 0) {
+-                        bytesInThisTile = (newRect.width/8) * newRect.height;
++                        bytesInThisTile = (newRect.width / 8) * newRect.height;
+                     } else {
+                         bytesInThisTile =
+-                            (newRect.width/8 + 1) * newRect.height;
++                            (newRect.width / 8 + 1) * newRect.height;
+                     }
+                     decodePackbits(data, bytesInThisTile, bdata);
+                 } else if (compression == COMP_LZW) {
+@@ -926,12 +837,12 @@
+             } catch (IOException ioe) {
+                 throw new RuntimeException("TIFFImage13");
+             }
+-        } else if(imageType == TYPE_PALETTE) { // palette-RGB
++        } else if (imageType == TYPE_PALETTE) { // palette-RGB
+             if (sampleSize == 16) {
+ 
+                 if (decodePaletteAsShorts) {
+ 
+-                    short[] tempData= null;
++                    short[] tempData = null;
+ 
+                     // At this point the data is 1 banded and will
+                     // become 3 banded only after we've done the palette
+@@ -984,8 +895,8 @@
+                             // in this tile, but we need to read in shorts,
+                             // which will take half the space, so while
+                             // allocating we divide byteCount by 2.
+-                            tempData = new short[byteCount/2];
+-                            readShorts(byteCount/2, tempData);
++                            tempData = new short[byteCount / 2];
++                            readShorts(byteCount / 2, tempData);
+                         }
+ 
+                         stream.seek(save_offset);
+@@ -999,16 +910,16 @@
+                         // Expand the palette image into an rgb image with ushort
+                         // data type.
+                         int cmapValue;
+-                        int count = 0, lookup, len = colormap.length/3;
++                        int count = 0, lookup, len = colormap.length / 3;
+                         int len2 = len * 2;
+-                        for (int i=0; i<unitsBeforeLookup; i++) {
++                        for (int i = 0; i < unitsBeforeLookup; i++) {
+                             // Get the index into the colormap
+                             lookup = tempData[i] & 0xffff;
+                             // Get the blue value
+-                            cmapValue = colormap[lookup+len2];
++                            cmapValue = colormap[lookup + len2];
+                             sdata[count++] = (short)(cmapValue & 0xffff);
+                             // Get the green value
+-                            cmapValue = colormap[lookup+len];
++                            cmapValue = colormap[lookup + len];
+                             sdata[count++] = (short)(cmapValue & 0xffff);
+                             // Get the red value
+                             cmapValue = colormap[lookup];
+@@ -1020,16 +931,16 @@
+                         // Expand the palette image into an rgb image with
+                         // short data type.
+                         int cmapValue;
+-                        int count = 0, lookup, len = colormap.length/3;
++                        int count = 0, lookup, len = colormap.length / 3;
+                         int len2 = len * 2;
+-                        for (int i=0; i<unitsBeforeLookup; i++) {
++                        for (int i = 0; i < unitsBeforeLookup; i++) {
+                             // Get the index into the colormap
+                             lookup = tempData[i] & 0xffff;
+                             // Get the blue value
+-                            cmapValue = colormap[lookup+len2];
++                            cmapValue = colormap[lookup + len2];
+                             sdata[count++] = (short)cmapValue;
+                             // Get the green value
+-                            cmapValue = colormap[lookup+len];
++                            cmapValue = colormap[lookup + len];
+                             sdata[count++] = (short)cmapValue;
+                             // Get the red value
+                             cmapValue = colormap[lookup];
+@@ -1084,7 +995,7 @@
+ 
+                         } else if (compression == COMP_NONE) {
+ 
+-                            readShorts(byteCount/2, sdata);
++                            readShorts(byteCount / 2, sdata);
+                         }
+ 
+                         stream.seek(save_offset);
+@@ -1098,7 +1009,7 @@
+ 
+                 if (decodePaletteAsShorts) {
+ 
+-                    byte[] tempData= null;
++                    byte[] tempData = null;
+ 
+                     // At this point the data is 1 banded and will
+                     // become 3 banded only after we've done the palette
+@@ -1121,25 +1032,6 @@
+                             tempData = new byte[unitsBeforeLookup];
+                             lzwDecoder.decode(data, tempData, newRect.height);
+ 
+-                        } else if (compression == COMP_JPEG_TTN2) {
+-
+-                            stream.readFully(data, 0, byteCount);
+-                            Raster tempTile = decodeJPEG(data,
+-                                                         decodeParam,
+-                                                         colorConvertJPEG,
+-                                                         tile.getMinX(),
+-                                                         tile.getMinY());
+-                            int[] tempPixels = new int[unitsBeforeLookup];
+-                            tempTile.getPixels(tile.getMinX(),
+-                                               tile.getMinY(),
+-                                               tile.getWidth(),
+-                                               tile.getHeight(),
+-                                               tempPixels);
+-                            tempData = new byte[unitsBeforeLookup];
+-                            for(int i = 0; i < unitsBeforeLookup; i++) {
+-                                tempData[i] = (byte)tempPixels[i];
+-                            }
+-
+                         }  else if (compression == COMP_DEFLATE) {
+ 
+                             stream.readFully(data, 0, byteCount);
+@@ -1150,6 +1042,9 @@
+ 
+                             tempData = new byte[byteCount];
+                             stream.readFully(tempData, 0, byteCount);
++                        } else {
++                            throw new RuntimeException(
++                                    "Compression type not supported: " + compression);
+                         }
+ 
+                         stream.seek(save_offset);
+@@ -1161,16 +1056,16 @@
+                     // Expand the palette image into an rgb image with ushort
+                     // data type.
+                     int cmapValue;
+-                    int count = 0, lookup, len = colormap.length/3;
++                    int count = 0, lookup, len = colormap.length / 3;
+                     int len2 = len * 2;
+-                    for (int i=0; i<unitsBeforeLookup; i++) {
++                    for (int i = 0; i < unitsBeforeLookup; i++) {
+                         // Get the index into the colormap
+                         lookup = tempData[i] & 0xff;
+                         // Get the blue value
+-                        cmapValue = colormap[lookup+len2];
++                        cmapValue = colormap[lookup + len2];
+                         sdata[count++] = (short)(cmapValue & 0xffff);
+                         // Get the green value
+-                        cmapValue = colormap[lookup+len];
++                        cmapValue = colormap[lookup + len];
+                         sdata[count++] = (short)(cmapValue & 0xffff);
+                         // Get the red value
+                         cmapValue = colormap[lookup];
+@@ -1193,15 +1088,6 @@
+                             stream.readFully(data, 0, byteCount);
+                             lzwDecoder.decode(data, bdata, newRect.height);
+ 
+-                        } else if (compression == COMP_JPEG_TTN2) {
+-
+-                            stream.readFully(data, 0, byteCount);
+-                            tile.setRect(decodeJPEG(data,
+-                                                    decodeParam,
+-                                                    colorConvertJPEG,
+-                                                    tile.getMinX(),
+-                                                    tile.getMinY()));
+-
+                         }  else if (compression == COMP_DEFLATE) {
+ 
+                             stream.readFully(data, 0, byteCount);
+@@ -1210,6 +1096,10 @@
+                         } else if (compression == COMP_NONE) {
+ 
+                             stream.readFully(bdata, 0, byteCount);
++
++                        } else {
++                            throw new RuntimeException(
++                                    "Compression type not supported: " + compression);
+                         }
+ 
+                         stream.seek(save_offset);
+@@ -1222,8 +1112,7 @@
+             } else if (sampleSize == 4) {
+ 
+                 int padding = (newRect.width % 2 == 0) ? 0 : 1;
+-                int bytesPostDecoding = ((newRect.width/2 + padding) *
+-                                         newRect.height);
++                int bytesPostDecoding = ((newRect.width / 2 + padding) * newRect.height);
+ 
+                 // Output short images
+                 if (decodePaletteAsShorts) {
+@@ -1264,8 +1153,8 @@
+                     data = new byte[bytes];
+ 
+                     int srcCount = 0, dstCount = 0;
+-                    for (int j=0; j<newRect.height; j++) {
+-                        for (int i=0; i<newRect.width/2; i++) {
++                    for (int j = 0; j < newRect.height; j++) {
++                        for (int i = 0; i < newRect.width / 2; i++) {
+                             data[dstCount++] =
+                                 (byte)((tempData[srcCount] & 0xf0) >> 4);
+                             data[dstCount++] =
+@@ -1278,15 +1167,15 @@
+                         }
+                     }
+ 
+-                    int len = colormap.length/3;
+-                    int len2 = len*2;
++                    int len = colormap.length / 3;
++                    int len2 = len * 2;
+                     int cmapValue, lookup;
+                     int count = 0;
+-                    for (int i=0; i<bytes; i++) {
++                    for (int i = 0; i < bytes; i++) {
+                         lookup = data[i] & 0xff;
+-                        cmapValue = colormap[lookup+len2];
++                        cmapValue = colormap[lookup + len2];
+                         sdata[count++] = (short)(cmapValue & 0xffff);
+-                        cmapValue = colormap[lookup+len];
++                        cmapValue = colormap[lookup + len];
+                         sdata[count++] = (short)(cmapValue & 0xffff);
+                         cmapValue = colormap[lookup];
+                         sdata[count++] = (short)(cmapValue & 0xffff);
+@@ -1324,7 +1213,7 @@
+                     }
+                 }
+             }
+-        } else if(imageType == TYPE_GRAY_4BIT) { // 4-bit gray
++        } else if (imageType == TYPE_GRAY_4BIT) { // 4-bit gray
+             try {
+                 if (compression == COMP_PACKBITS) {
+ 
+@@ -1334,9 +1223,9 @@
+                     // 2 pixels into 1 byte, calculate bytesInThisTile
+                     int bytesInThisTile;
+                     if ((newRect.width % 8) == 0) {
+-                        bytesInThisTile = (newRect.width/2) * newRect.height;
++                        bytesInThisTile = (newRect.width / 2) * newRect.height;
+                     } else {
+-                        bytesInThisTile = (newRect.width/2 + 1) *
++                        bytesInThisTile = (newRect.width / 2 + 1) *
+                             newRect.height;
+                     }
+ 
+@@ -1379,25 +1268,21 @@
+                         stream.readFully(data, 0, byteCount);
+                         decodePackbits(data, unitsInThisTile, bdata);
+ 
+-                    } else if (compression == COMP_JPEG_TTN2) {
+-
+-                        stream.readFully(data, 0, byteCount);
+-                        tile.setRect(decodeJPEG(data,
+-                                                decodeParam,
+-                                                colorConvertJPEG,
+-                                                tile.getMinX(),
+-                                                tile.getMinY()));
+                     } else if (compression == COMP_DEFLATE) {
+ 
+                         stream.readFully(data, 0, byteCount);
+                         inflate(data, bdata);
++
++                    } else {
++                        throw new RuntimeException(
++                                "Compression type not supported: " + compression);
+                     }
+ 
+                 } else if (sampleSize == 16) {
+ 
+                     if (compression == COMP_NONE) {
+ 
+-                        readShorts(byteCount/2, sdata);
++                        readShorts(byteCount / 2, sdata);
+ 
+                     } else if (compression == COMP_LZW) {
+ 
+@@ -1441,7 +1326,7 @@
+                            dataType == DataBuffer.TYPE_INT) { // redundant
+                     if (compression == COMP_NONE) {
+ 
+-                        readInts(byteCount/4, idata);
++                        readInts(byteCount / 4, idata);
+ 
+                     } else if (compression == COMP_LZW) {
+ 
+@@ -1490,10 +1375,10 @@
+             }
+ 
+             // Modify the data for certain special cases.
+-            switch(imageType) {
++            switch (imageType) {
+             case TYPE_GRAY:
+             case TYPE_GRAY_ALPHA:
+-                if(isWhiteZero) {
++                if (isWhiteZero) {
+                     // Since we are using a ComponentColorModel with this
+                     // image, we need to change the WhiteIsZero data to
+                     // BlackIsZero data so it will display properly.
+@@ -1529,23 +1414,23 @@
+                 // Change RGB to BGR order, as Java2D displays that faster.
+                 // Unnecessary for JPEG-in-TIFF as the decoder handles it.
+                 if (sampleSize == 8 && compression != COMP_JPEG_TTN2) {
+-                    for (int i=0; i<unitsInThisTile; i+=3) {
++                    for (int i = 0; i < unitsInThisTile; i += 3) {
+                         bswap = bdata[i];
+-                        bdata[i] = bdata[i+2];
+-                        bdata[i+2] = bswap;
++                        bdata[i] = bdata[i + 2];
++                        bdata[i + 2] = bswap;
+                     }
+                 } else if (sampleSize == 16) {
+-                    for (int i=0; i<unitsInThisTile; i+=3) {
++                    for (int i = 0; i < unitsInThisTile; i += 3) {
+                         sswap = sdata[i];
+-                        sdata[i] = sdata[i+2];
+-                        sdata[i+2] = sswap;
++                        sdata[i] = sdata[i + 2];
++                        sdata[i + 2] = sswap;
+                     }
+                 } else if (sampleSize == 32) {
+-                    if(dataType == DataBuffer.TYPE_INT) {
+-                        for (int i=0; i<unitsInThisTile; i+=3) {
++                    if (dataType == DataBuffer.TYPE_INT) {
++                        for (int i = 0; i < unitsInThisTile; i += 3) {
+                             iswap = idata[i];
+-                            idata[i] = idata[i+2];
+-                            idata[i+2] = iswap;
++                            idata[i] = idata[i + 2];
++                            idata[i + 2] = iswap;
+                         }
+                     }
+                 }
+@@ -1553,41 +1438,41 @@
+             case TYPE_RGB_ALPHA:
+                 // Convert from RGBA to ABGR for Java2D
+                 if (sampleSize == 8) {
+-                    for (int i=0; i<unitsInThisTile; i+=4) {
++                    for (int i = 0; i < unitsInThisTile; i += 4) {
+                         // Swap R and A
+                         bswap = bdata[i];
+-                        bdata[i] = bdata[i+3];
+-                        bdata[i+3] = bswap;
++                        bdata[i] = bdata[i + 3];
++                        bdata[i + 3] = bswap;
+ 
+                         // Swap G and B
+-                        bswap = bdata[i+1];
+-                        bdata[i+1] = bdata[i+2];
+-                        bdata[i+2] = bswap;
++                        bswap = bdata[i + 1];
++                        bdata[i + 1] = bdata[i + 2];
++                        bdata[i + 2] = bswap;
+                     }
+                 } else if (sampleSize == 16) {
+-                    for (int i=0; i<unitsInThisTile; i+=4) {
++                    for (int i = 0; i < unitsInThisTile; i += 4) {
+                         // Swap R and A
+                         sswap = sdata[i];
+-                        sdata[i] = sdata[i+3];
+-                        sdata[i+3] = sswap;
++                        sdata[i] = sdata[i + 3];
++                        sdata[i + 3] = sswap;
+ 
+                         // Swap G and B
+-                        sswap = sdata[i+1];
+-                        sdata[i+1] = sdata[i+2];
+-                        sdata[i+2] = sswap;
++                        sswap = sdata[i + 1];
++                        sdata[i + 1] = sdata[i + 2];
++                        sdata[i + 2] = sswap;
+                     }
+                 } else if (sampleSize == 32) {
+-                    if(dataType == DataBuffer.TYPE_INT) {
+-                        for (int i=0; i<unitsInThisTile; i+=4) {
++                    if (dataType == DataBuffer.TYPE_INT) {
++                        for (int i = 0; i < unitsInThisTile; i += 4) {
+                             // Swap R and A
+                             iswap = idata[i];
+-                            idata[i] = idata[i+3];
+-                            idata[i+3] = iswap;
++                            idata[i] = idata[i + 3];
++                            idata[i + 3] = iswap;
+ 
+                             // Swap G and B
+-                            iswap = idata[i+1];
+-                            idata[i+1] = idata[i+2];
+-                            idata[i+2] = iswap;
++                            iswap = idata[i + 1];
++                            idata[i + 1] = idata[i + 2];
++                            idata[i + 2] = iswap;
+                         }
+                     }
+                 }
+@@ -1595,15 +1480,15 @@
+             case TYPE_YCBCR_SUB:
+                 // Post-processing for YCbCr with subsampled chrominance:
+                 // simply replicate the chroma channels for displayability.
+-                int pixelsPerDataUnit = chromaSubH*chromaSubV;
++                int pixelsPerDataUnit = chromaSubH * chromaSubV;
+ 
+-                int numH = newRect.width/chromaSubH;
+-                int numV = newRect.height/chromaSubV;
++                int numH = newRect.width / chromaSubH;
++                int numV = newRect.height / chromaSubV;
+ 
+-                byte[] tempData = new byte[numH*numV*(pixelsPerDataUnit + 2)];
++                byte[] tempData = new byte[numH * numV * (pixelsPerDataUnit + 2)];
+                 System.arraycopy(bdata, 0, tempData, 0, tempData.length);
+ 
+-                int samplesPerDataUnit = pixelsPerDataUnit*3;
++                int samplesPerDataUnit = pixelsPerDataUnit * 3;
+                 int[] pixels = new int[samplesPerDataUnit];
+ 
+                 int bOffset = 0;
+@@ -1611,13 +1496,13 @@
+                 int offsetCr = offsetCb + 1;
+ 
+                 int y = newRect.y;
+-                for(int j = 0; j < numV; j++) {
++                for (int j = 0; j < numV; j++) {
+                     int x = newRect.x;
+-                    for(int i = 0; i < numH; i++) {
++                    for (int i = 0; i < numH; i++) {
+                         int Cb = tempData[bOffset + offsetCb];
+                         int Cr = tempData[bOffset + offsetCr];
+                         int k = 0;
+-                        while(k < samplesPerDataUnit) {
++                        while (k < samplesPerDataUnit) {
+                             pixels[k++] = tempData[bOffset++];
+                             pixels[k++] = Cb;
+                             pixels[k++] = Cr;
+@@ -1679,7 +1564,7 @@
+ 
+         if (isBigEndian) {
+ 
+-            for (int i=0; i<shortCount; i++) {
++            for (int i = 0; i < shortCount; i++) {
+                 firstByte = byteArray[j++] & 0xff;
+                 secondByte = byteArray[j++] & 0xff;
+                 shortArray[i] = (short)((firstByte << 8) + secondByte);
+@@ -1687,7 +1572,7 @@
+ 
+         } else {
+ 
+-            for (int i=0; i<shortCount; i++) {
++            for (int i = 0; i < shortCount; i++) {
+                 firstByte = byteArray[j++] & 0xff;
+                 secondByte = byteArray[j++] & 0xff;
+                 shortArray[i] = (short)((secondByte << 8) + firstByte);
+@@ -1705,7 +1590,7 @@
+ 
+         if (isBigEndian) {
+ 
+-            for (int i=0; i<intCount; i++) {
++            for (int i = 0; i < intCount; i++) {
+                 intArray[i] = (((byteArray[j++] & 0xff) << 24) |
+                                ((byteArray[j++] & 0xff) << 16) |
+                                ((byteArray[j++] & 0xff) << 8) |
+@@ -1714,7 +1599,7 @@
+ 
+         } else {
+ 
+-            for (int i=0; i<intCount; i++) {
++            for (int i = 0; i < intCount; i++) {
+                 intArray[i] = ((byteArray[j++] & 0xff) |
+                               ((byteArray[j++] & 0xff) << 8) |
+                               ((byteArray[j++] & 0xff) << 16) |
+@@ -1742,7 +1627,7 @@
+                 if (b >= 0 && b <= 127) {
+ 
+                     // literal run packet
+-                    for (int i=0; i<(b + 1); i++) {
++                    for (int i = 0; i < (b + 1); i++) {
+                         dst[dstCount++] = data[srcCount++];
+                     }
+ 
+@@ -1750,7 +1635,7 @@
+ 
+                     // 2 byte encoded run packet
+                     repeat = data[srcCount++];
+-                    for (int i=0; i<(-b + 1); i++) {
++                    for (int i = 0; i < (-b + 1); i++) {
+                         dst[dstCount++] = repeat;
+                     }
+ 
+@@ -1803,7 +1688,7 @@
+         }
+ 
+         RGBBits = new int[numBands];
+-        for(int i = 0; i < numBands; i++) {
++        for (int i = 0; i < numBands; i++) {
+             RGBBits[i] = componentSize;
+         }
+ 
+diff -r 5073426893de xmlgraphics-commons-1.4/src/java/org/apache/xmlgraphics/java2d/ps/PSTilingPattern.java
+--- src/java/org/apache/xmlgraphics/java2d/ps/PSTilingPattern.java	Tue Feb 21 12:29:55 2012 +0100
++++ src/java/org/apache/xmlgraphics/java2d/ps/PSTilingPattern.java	Tue Feb 21 12:50:48 2012 +0100
+@@ -51,7 +51,7 @@
+     protected String patternName = null;
+ 
+     /**
+-     * The XUID is an extended unique ID — an array of integers that provides for
++     * The XUID is an extended unique ID � an array of integers that provides for
+      * distributed, hierarchical management of the space of unique ID numbers
+      * (optional)
+      */
+@@ -65,7 +65,7 @@
+     /**
+      * An array of four numbers in the pattern coordinate system, giving
+      * the coordinates of the left, bottom, right, and top edges, respectively, of the
+-     * pattern cell’s bounding box
++     * pattern cell's bounding box
+      */
+     protected Rectangle2D bBox = null;
+ 
+@@ -108,7 +108,7 @@
+      * the name is null, the pattern should be stored in PSPatternStorage, where the pattern
+      * gets a name (the pattern without name cannot be use in PS file)
+      * @param paintProc a postscript procedure for painting the pattern cell
+-     * @param bBox a pattern cell’s bounding box
++     * @param bBox a pattern cell's bounding box
+      * @param xStep the desired horizontal spacing between pattern cells
+      * @param yStep the desired vertical spacing between pattern cells
+      * @param paintType 1 for colored pattern, 2 for uncolored pattern
+@@ -192,7 +192,7 @@
+     /**
+      * Returns the bounding box.
+      *
+-     * @return a pattern cell’s bounding box
++     * @return a pattern cell's bounding box
+      */
+     public Rectangle2D getBoundingBox() {
+         return (this.bBox);
+@@ -201,7 +201,7 @@
+     /**
+      * Sets the bounding box.
+      *
+-     * @param bBox a pattern cell’s bounding box
++     * @param bBox a pattern cell's bounding box
+      */
+     public void setBoundingBox(Rectangle2D bBox) {
+         if (bBox == null) {
+@@ -392,9 +392,9 @@
+             }
+ 
+             // define color image: width height bits/comp matrix
+-            //                        datasrc0 … datasrcncomp-1 multi ncomp colorimage
++            //                        datasrc0 datasrcncomp-1 multi ncomp colorimage
+             sb.append(width + " " + height + " 8 " + "matrix\n");   // width height bits/comp matrix
+-            int [] argb = new int[width * height];                  // datasrc0 … datasrcncomp-1
++            int [] argb = new int[width * height];                  // datasrc0 datasrcncomp-1
+             sb.append("{<");
+             texture.getImage().getRGB(0, 0, width, height, argb, 0, width);
+             int count = 0;
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index e6d02a9..df6d7ee 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.4
-Release:        4
+Release:        5
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -8,6 +8,7 @@ Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://xmlgraphics.apache.org/
 Source0:        http://apache.skknet.net/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz
+Patch0:         %{name}-java-7-fix.patch
 
 BuildArch:      noarch
 BuildRequires:  java-devel >= 1:1.6.0
@@ -43,6 +44,7 @@ Requires:       jpackage-utils
 %prep
 %setup -q %{name}-%{version}
 rm -f `find . -name "*.jar"`
+%patch0
 
 # create pom from template
 sed "s:@version@:%{version}:g" %{name}-pom-template.pom \
@@ -84,6 +86,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Thu Mar 01 2012 Jiri Vanek <jvanek@redhat.com> - 0:1.4-5
+- Resolves: rhbz#796341
+- Added xmlgraphics-commons-java-7-fix.patch to fix build with Java 7
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From c309ff27e52a1f780fb704818629c0d3f2359ec6 Mon Sep 17 00:00:00 2001
From: Deepak Bhole <dbhole@redhat.com>
Date: Tue, 6 Mar 2012 16:11:33 -0500
Subject: [PATCH 07/55] Added dist tag to release

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index df6d7ee..65c350e 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.4
-Release:        5
+Release:        5%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -86,6 +86,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Mar 06 2012 Deepak Bhole <dbhole@redhat.com> 1.4-5
+- Added dist to the release tag
+
 * Thu Mar 01 2012 Jiri Vanek <jvanek@redhat.com> - 0:1.4-5
 - Resolves: rhbz#796341
 - Added xmlgraphics-commons-java-7-fix.patch to fix build with Java 7

From 3735d2fd1341fc44936b9f9a9b968be383253df5 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 22 Jul 2012 00:51:49 -0500
Subject: [PATCH 08/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 65c350e..d5331c3 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -86,6 +86,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Tue Mar 06 2012 Deepak Bhole <dbhole@redhat.com> 1.4-5
 - Added dist to the release tag
 

From b5fc31e3f3d7a089af9128815958213ab53a9468 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 21:50:17 -0600
Subject: [PATCH 09/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index d5331c3..1d17403 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -86,6 +86,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From d49a5ce820501d28cd25dff9f87816139fa31bc8 Mon Sep 17 00:00:00 2001
From: Mat Booth <fedora@matbooth.co.uk>
Date: Tue, 19 Mar 2013 17:33:44 +0000
Subject: [PATCH 10/55] Update to 1.5, rhbz #895934

- Drop unneeded patch
---
 .gitignore                           |    1 +
 sources                              |    2 +-
 xmlgraphics-commons-java-7-fix.patch | 1052 --------------------------
 xmlgraphics-commons.spec             |   32 +-
 4 files changed, 16 insertions(+), 1071 deletions(-)
 delete mode 100644 xmlgraphics-commons-java-7-fix.patch

diff --git a/.gitignore b/.gitignore
index c9f55e9..d887074 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xmlgraphics-commons-1.3-src.tar.gz
 xmlgraphics-commons-1.3.1-src.tar.gz
+/xmlgraphics-commons-1.5-src.tar.gz
diff --git a/sources b/sources
index ce1b97e..0f34c91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d2b56a1671d2ca63480e38acd9629ea7  xmlgraphics-commons-1.4-src.tar.gz
+e7012400a3c9d10a18bc5c3515610f35  xmlgraphics-commons-1.5-src.tar.gz
diff --git a/xmlgraphics-commons-java-7-fix.patch b/xmlgraphics-commons-java-7-fix.patch
deleted file mode 100644
index cc83a93..0000000
--- a/xmlgraphics-commons-java-7-fix.patch
+++ /dev/null
@@ -1,1052 +0,0 @@
-diff -r 5073426893de xmlgraphics-commons-1.4/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java
---- src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java	Tue Feb 21 12:29:55 2012 +0100
-+++ src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImage.java	Tue Feb 21 12:50:48 2012 +0100
-@@ -15,7 +15,7 @@
-  * limitations under the License.
-  */
- 
--/* $Id: TIFFImage.java 750418 2009-03-05 11:03:54Z vhennebert $ */
-+/* $Id$ */
- 
- package org.apache.xmlgraphics.image.codec.tiff;
- 
-@@ -35,7 +35,6 @@
- import java.awt.image.Raster;
- import java.awt.image.SampleModel;
- import java.awt.image.WritableRaster;
--import java.io.ByteArrayInputStream;
- import java.io.IOException;
- import java.util.HashMap;
- import java.util.Map;
-@@ -46,10 +45,6 @@
- import org.apache.xmlgraphics.image.rendered.AbstractRed;
- import org.apache.xmlgraphics.image.rendered.CachableRed;
- 
--import com.sun.image.codec.jpeg.JPEGCodec;
--import com.sun.image.codec.jpeg.JPEGDecodeParam;
--import com.sun.image.codec.jpeg.JPEGImageDecoder;
--
- public class TIFFImage extends AbstractRed {
- 
-     // Compression types
-@@ -101,10 +96,6 @@
-     // LZW compression related variable
-     int predictor;
- 
--    // TTN2 JPEG related variables
--    JPEGDecodeParam decodeParam = null;
--    boolean colorConvertJPEG = false;
--
-     // DEFLATE variables
-     Inflater inflater = null;
- 
-@@ -123,46 +114,6 @@
-     private TIFFLZWDecoder lzwDecoder = null;
- 
-     /**
--     * Decode a buffer of data into a Raster with the specified location.
--     *
--     * @param data buffer contain an interchange or abbreviated datastream.
--     * @param decodeParam decoding parameters; may be null unless the
--     *        data buffer contains an abbreviated datastream in which case
--     *        it may not be null or an error will occur.
--     * @param colorConvert whether to perform color conversion; in this
--     *        case that would be limited to YCbCr-to-RGB.
--     * @param minX the X position of the returned Raster.
--     * @param minY the Y position of the returned Raster.
--     */
--    private static final Raster decodeJPEG(byte[] data,
--                                           JPEGDecodeParam decodeParam,
--                                           boolean colorConvert,
--                                           int minX,
--                                           int minY) {
--        // Create an InputStream from the compressed data array.
--        ByteArrayInputStream jpegStream = new ByteArrayInputStream(data);
--
--        // Create a decoder.
--        JPEGImageDecoder decoder = decodeParam == null ?
--            JPEGCodec.createJPEGDecoder(jpegStream) :
--            JPEGCodec.createJPEGDecoder(jpegStream,
--                                        decodeParam);
--
--        // Decode the compressed data into a Raster.
--        Raster jpegRaster;
--        try {
--            jpegRaster = colorConvert ?
--                decoder.decodeAsBufferedImage().getWritableTile(0, 0) :
--                decoder.decodeAsRaster();
--        } catch (IOException ioe) {
--            throw new RuntimeException("TIFFImage13");
--        }
--
--        // Translate the decoded Raster to the specified location and return.
--        return jpegRaster.createTranslatedChild(minX, minY);
--    }
--
--    /**
-      * Inflates <code>deflated</code> into <code>inflated</code> using the
-      * <code>Inflater</code> constructed during class instantiation.
-      */
-@@ -170,8 +121,8 @@
-         inflater.setInput(deflated);
-         try {
-             inflater.inflate(inflated);
--        } catch(DataFormatException dfe) {
--            throw new RuntimeException("TIFFImage17"+": "+
-+        } catch (DataFormatException dfe) {
-+            throw new RuntimeException("TIFFImage17" + ": " +
-                                        dfe.getMessage());
-         }
-         inflater.reset();
-@@ -180,26 +131,27 @@
-     private static SampleModel createPixelInterleavedSampleModel
-         (int dataType, int tileWidth, int tileHeight, int bands) {
-         int [] bandOffsets = new int[bands];
--        for (int i=0; i<bands; i++)
-+        for (int i = 0; i < bands; i++) {
-             bandOffsets[i] = i;
-+        }
-         return new PixelInterleavedSampleModel
-             (dataType, tileWidth, tileHeight, bands,
--             tileWidth*bands, bandOffsets);
-+             tileWidth * bands, bandOffsets);
-     }
- 
-     /**
-      * Return as a long[] the value of a TIFF_LONG or TIFF_SHORT field.
-      */
--    private final long[] getFieldAsLongs(TIFFField field) {
-+    private long[] getFieldAsLongs(TIFFField field) {
-         long[] value = null;
- 
--        if(field.getType() == TIFFField.TIFF_SHORT) {
-+        if (field.getType() == TIFFField.TIFF_SHORT) {
-             char[] charValue = field.getAsChars();
-             value = new long[charValue.length];
--            for(int i = 0; i < charValue.length; i++) {
--                value[i] = charValue[i]  & 0xffff;
-+            for (int i = 0; i < charValue.length; i++) {
-+                value[i] = charValue[i] & 0xffff;
-             }
--        } else if(field.getType() == TIFFField.TIFF_LONG) {
-+        } else if (field.getType() == TIFFField.TIFF_LONG) {
-             value = field.getAsLongs();
-         } else {
-             throw new RuntimeException();
-@@ -255,7 +207,7 @@
-             TIFFField bitsField =
-                 dir.getField(TIFFImageDecoder.TIFF_BITS_PER_SAMPLE);
-             char[] bitsPerSample = null;
--            if(bitsField != null) {
-+            if (bitsField != null) {
-                 bitsPerSample = bitsField.getAsChars();
-             } else {
-                 bitsPerSample = new char[] {1};
-@@ -279,7 +231,7 @@
-                 sampleFormat = sampleFormatField.getAsChars();
- 
-                 // Check that all the samples have the same format
--                for (int l=1; l<sampleFormat.length; l++) {
-+                for (int l = 1; l < sampleFormat.length; l++) {
-                     if (sampleFormat[l] != sampleFormat[0]) {
-                         throw new RuntimeException("TIFFImage2");
-                     }
-@@ -291,34 +243,34 @@
- 
-             // Set the data type based on the sample size and format.
-             boolean isValidDataFormat = false;
--            switch(sampleSize) {
-+            switch (sampleSize) {
-             case 1:
-             case 4:
-             case 8:
--                if(sampleFormat[0] != 3) {
-+                if (sampleFormat[0] != 3) {
-                     // Ignore whether signed or unsigned: treat all as unsigned.
-                     dataType = DataBuffer.TYPE_BYTE;
-                     isValidDataFormat = true;
-                 }
-                 break;
-             case 16:
--                if(sampleFormat[0] != 3) {
-+                if (sampleFormat[0] != 3) {
-                     dataType = sampleFormat[0] == 2 ?
-                         DataBuffer.TYPE_SHORT : DataBuffer.TYPE_USHORT;
-                     isValidDataFormat = true;
-                 }
-                 break;
-             case 32:
--              if (sampleFormat[0] == 3)
-+              if (sampleFormat[0] == 3) {
-                 isValidDataFormat = false;
--              else {
-+            } else {
-                 dataType = DataBuffer.TYPE_INT;
-                 isValidDataFormat = true;
-               }
-               break;
-             }
- 
--            if(!isValidDataFormat) {
-+            if (!isValidDataFormat) {
-                 throw new RuntimeException("TIFFImage3");
-             }
- 
-@@ -342,11 +294,11 @@
-             case 0: // WhiteIsZero
-                 isWhiteZero = true;
-             case 1: // BlackIsZero
--                if(sampleSize == 1 && samplesPerPixel == 1) {
-+                if (sampleSize == 1 && samplesPerPixel == 1) {
-                     imageType = TYPE_BILEVEL;
--                } else if(sampleSize == 4 && samplesPerPixel == 1) {
-+                } else if (sampleSize == 4 && samplesPerPixel == 1) {
-                     imageType = TYPE_GRAY_4BIT;
--                } else if(sampleSize % 8 == 0) {
-+                } else if (sampleSize % 8 == 0) {
-                     if(samplesPerPixel == 1) {
-                         imageType = TYPE_GRAY;
-                     } else if(samplesPerPixel == 2) {
-@@ -357,10 +309,10 @@
-                 }
-                 break;
-             case 2: // RGB
--                if(sampleSize % 8 == 0) {
--                    if(samplesPerPixel == 3) {
-+                if (sampleSize % 8 == 0) {
-+                    if (samplesPerPixel == 3) {
-                         imageType = TYPE_RGB;
--                    } else if(samplesPerPixel == 4) {
-+                    } else if (samplesPerPixel == 4) {
-                         imageType = TYPE_RGB_ALPHA;
-                     } else {
-                         imageType = TYPE_GENERIC;
-@@ -368,48 +320,24 @@
-                 }
-                 break;
-             case 3: // RGB Palette
--                if(samplesPerPixel == 1 &&
-+                if (samplesPerPixel == 1 &&
-                    (sampleSize == 4 || sampleSize == 8 || sampleSize == 16)) {
-                     imageType = TYPE_PALETTE;
-                 }
-                 break;
-             case 4: // Transparency mask
--                if(sampleSize == 1 && samplesPerPixel == 1) {
-+                if (sampleSize == 1 && samplesPerPixel == 1) {
-                     imageType = TYPE_BILEVEL;
-                 }
-                 break;
--            case 6: // YCbCr
--                if(compression == COMP_JPEG_TTN2 &&
--                   sampleSize == 8 && samplesPerPixel == 3) {
--                    // Set color conversion flag.
--                    colorConvertJPEG = param.getJPEGDecompressYCbCrToRGB();
--
--                    // Set type to RGB if color converting.
--                    imageType = colorConvertJPEG ? TYPE_RGB : TYPE_GENERIC;
--                } else {
--                    TIFFField chromaField = dir.getField(TIFF_YCBCR_SUBSAMPLING);
--                    if(chromaField != null) {
--                        chromaSubH = chromaField.getAsInt(0);
--                        chromaSubV = chromaField.getAsInt(1);
--                    } else {
--                        chromaSubH = chromaSubV = 2;
--                    }
--
--                    if(chromaSubH*chromaSubV == 1) {
--                        imageType = TYPE_GENERIC;
--                    } else if(sampleSize == 8 && samplesPerPixel == 3) {
--                        imageType = TYPE_YCBCR_SUB;
--                    }
--                }
--                break;
-             default: // Other including CMYK, CIE L*a*b*, unknown.
--                if(sampleSize % 8 == 0) {
-+                if (sampleSize % 8 == 0) {
-                     imageType = TYPE_GENERIC;
-                 }
-             }
- 
-             // Bail out if not one of the supported types.
--            if(imageType == TYPE_UNSUPPORTED) {
-+            if (imageType == TYPE_UNSUPPORTED) {
-                 throw new RuntimeException("TIFFImage4");
-             }
- 
-@@ -490,8 +418,8 @@
-             }
- 
-             // Calculate number of tiles and the tileSize in bytes
--            tilesX = (bounds.width + tileWidth - 1)/tileWidth;
--            tilesY = (bounds.height + tileHeight - 1)/tileHeight;
-+            tilesX = (bounds.width + tileWidth - 1) / tileWidth;
-+            tilesY = (bounds.height + tileHeight - 1) / tileHeight;
-             tileSize = tileWidth * tileHeight * numBands;
- 
-             // Check whether big endian or little endian format is used.
-@@ -517,7 +445,7 @@
-             case COMP_FAX_G3_1D:
-             case COMP_FAX_G3_2D:
-             case COMP_FAX_G4_2D:
--                if(sampleSize != 1) {
-+                if (sampleSize != 1) {
-                     throw new RuntimeException("TIFFImage7");
-                 }
- 
-@@ -577,29 +505,9 @@
-             case COMP_JPEG_OLD:
-                 throw new RuntimeException("TIFFImage15");
- 
--            case COMP_JPEG_TTN2:
--                if(!(sampleSize == 8 &&
--                     ((imageType == TYPE_GRAY && samplesPerPixel == 1) ||
--                      (imageType == TYPE_PALETTE && samplesPerPixel == 1) ||
--                      (imageType == TYPE_RGB && samplesPerPixel == 3)))) {
--                    throw new RuntimeException("TIFFImage16");
--                }
--
--                // Create decodeParam from JPEGTables field if present.
--                if(dir.isTagPresent(TIFF_JPEG_TABLES)) {
--                    TIFFField jpegTableField = dir.getField(TIFF_JPEG_TABLES);
--                    byte[] jpegTable = jpegTableField.getAsBytes();
--                    ByteArrayInputStream tableStream =
--                        new ByteArrayInputStream(jpegTable);
--                    JPEGImageDecoder decoder =
--                        JPEGCodec.createJPEGDecoder(tableStream);
--                    decoder.decodeAsRaster();
--                    decodeParam = decoder.getJPEGDecodeParam();
--                }
--
--                break;
-             default:
--                throw new RuntimeException("TIFFImage10");
-+                throw new RuntimeException("Compression not supported: " + compression);
-+                //throw new RuntimeException("TIFFImage10");
-             }
- 
-             ColorModel  colorModel  = null;
-@@ -612,18 +520,20 @@
-                                                     tileWidth,
-                                                     tileHeight,
-                                                     sampleSize);
--                if(imageType == TYPE_BILEVEL) {
-+                if (imageType == TYPE_BILEVEL) {
-                     byte[] map = new byte[] {(byte)(isWhiteZero ? 255 : 0),
-                                              (byte)(isWhiteZero ? 0 : 255)};
-                     colorModel = new IndexColorModel(1, 2, map, map, map);
-                 } else {
-                     byte [] map = new byte[16];
-                     if (isWhiteZero) {
--                        for (int i=0; i<map.length; i++)
--                            map[i] = (byte)(255-(16*i));
-+                        for (int i = 0; i < map.length; i++) {
-+                            map[i] = (byte)(255 - (16 * i));
-+                        }
-                     } else {
--                        for (int i=0; i<map.length; i++)
--                            map[i] = (byte)(16*i);
-+                        for (int i = 0; i < map.length; i++) {
-+                            map[i] = (byte)(16 * i);
-+                        }
-                     }
-                     colorModel = new IndexColorModel(4, 16, map, map, map);
-                 }
-@@ -636,22 +546,22 @@
-                 // Create a pixel interleaved SampleModel with decreasing
-                 // band offsets.
-                 int[] reverseOffsets = new int[numBands];
--                for (int i=0; i<numBands; i++) {
-+                for (int i = 0; i < numBands; i++) {
-                     reverseOffsets[i] = numBands - 1 - i;
-                 }
-                 sampleModel = new PixelInterleavedSampleModel
-                     (dataType, tileWidth, tileHeight,
--                     numBands, numBands*tileWidth, reverseOffsets);
-+                     numBands, numBands * tileWidth, reverseOffsets);
- 
--                if(imageType == TYPE_GRAY) {
-+                if (imageType == TYPE_GRAY) {
-                   colorModel = new ComponentColorModel
-                     (ColorSpace.getInstance(ColorSpace.CS_GRAY),
--                     new int[] { sampleSize }, false, false,
-+                     new int[] {sampleSize}, false, false,
-                      Transparency.OPAQUE, dataType);
-                 } else if (imageType == TYPE_RGB) {
-                   colorModel = new ComponentColorModel
-                     (ColorSpace.getInstance(ColorSpace.CS_sRGB),
--                     new int[] { sampleSize, sampleSize, sampleSize },
-+                     new int[] {sampleSize, sampleSize, sampleSize},
-                      false, false, Transparency.OPAQUE, dataType);
-                 } else { // hasAlpha
-                     // Transparency.OPAQUE signifies image data that is
-@@ -659,9 +569,9 @@
-                     // value of 1.0. So the extra band gets ignored, which is
-                     // what we want.
-                     int transparency = Transparency.OPAQUE;
--                    if(extraSamples == 1) { // associated (premultiplied) alpha
-+                    if (extraSamples == 1) { // associated (premultiplied) alpha
-                         transparency = Transparency.TRANSLUCENT;
--                    } else if(extraSamples == 2) { // unassociated alpha
-+                    } else if (extraSamples == 2) { // unassociated alpha
-                         transparency = Transparency.BITMASK;
-                     }
- 
-@@ -680,7 +590,7 @@
-                 // ColorModel as null, as there is no appropriate ColorModel.
- 
-                 int[] bandOffsets = new int[numBands];
--                for (int i=0; i<numBands; i++) {
-+                for (int i = 0; i < numBands; i++) {
-                     bandOffsets[i] = i;
-                 }
- 
-@@ -721,7 +631,7 @@
- 
-                   colorModel = new ComponentColorModel
-                     (ColorSpace.getInstance(ColorSpace.CS_sRGB),
--                     new int[] { 16, 16, 16 }, false, false,
-+                     new int[] {16, 16, 16}, false, false,
-                      Transparency.OPAQUE, dataType);
- 
-                 } else {
-@@ -753,7 +663,7 @@
-                              numBands);
-                     }
- 
--                    int bandLength = colormap.length/3;
-+                    int bandLength = colormap.length / 3;
-                     byte[] r = new byte[bandLength];
-                     byte[] g = new byte[bandLength];
-                     byte[] b = new byte[bandLength];
-@@ -763,24 +673,24 @@
- 
-                     if (dataType == DataBuffer.TYPE_SHORT) {
- 
--                        for (int i=0; i<bandLength; i++) {
-+                        for (int i = 0; i < bandLength; i++) {
-                             r[i] = param.decodeSigned16BitsTo8Bits
-                                 ((short)colormap[i]);
-                             g[i] = param.decodeSigned16BitsTo8Bits
--                                ((short)colormap[gIndex+i]);
-+                                ((short)colormap[gIndex + i]);
-                             b[i] = param.decodeSigned16BitsTo8Bits
--                                ((short)colormap[bIndex+i]);
-+                                ((short)colormap[bIndex + i]);
-                         }
- 
-                     } else {
- 
--                        for (int i=0; i<bandLength; i++) {
-+                        for (int i = 0; i < bandLength; i++) {
-                             r[i] = param.decode16BitsTo8Bits
-                                 (colormap[i] & 0xffff);
-                             g[i] = param.decode16BitsTo8Bits
--                                (colormap[gIndex+i] & 0xffff);
-+                                (colormap[gIndex + i] & 0xffff);
-                             b[i] = param.decode16BitsTo8Bits
--                                (colormap[bIndex+i] & 0xffff);
-+                                (colormap[bIndex + i] & 0xffff);
-                         }
- 
-                     }
-@@ -838,7 +748,7 @@
-         int[] idata = null;
- 
-         SampleModel sampleModel = getSampleModel();
--        WritableRaster tile = makeTile(tileX,tileY);
-+        WritableRaster tile = makeTile(tileX, tileY);
- 
-         DataBuffer buffer = tile.getDataBuffer();
- 
-@@ -862,21 +772,22 @@
-         long save_offset = 0;
-         try {
-             save_offset = stream.getFilePointer();
--            stream.seek(tileOffsets[tileY*tilesX + tileX]);
-+            stream.seek(tileOffsets[tileY * tilesX + tileX]);
-         } catch (IOException ioe) {
-             throw new RuntimeException("TIFFImage13");
-         }
- 
-         // Number of bytes in this tile (strip) after compression.
--        int byteCount = (int)tileByteCounts[tileY*tilesX + tileX];
-+        int byteCount = (int)tileByteCounts[tileY * tilesX + tileX];
- 
-         // Find out the number of bytes in the current tile
-         Rectangle newRect;
--        if (!tiled)
-+        if (!tiled) {
-             newRect = tile.getBounds();
--        else
-+        } else {
-             newRect = new Rectangle(tile.getMinX(), tile.getMinY(),
-                                     tileWidth, tileHeight);
-+        }
- 
-         int unitsInThisTile = newRect.width * newRect.height * numBands;
- 
-@@ -886,7 +797,7 @@
- 
-         // Read the data, uncompressing as needed. There are four cases:
-         // bilevel, palette-RGB, 4-bit grayscale, and everything else.
--        if(imageType == TYPE_BILEVEL) { // bilevel
-+        if (imageType == TYPE_BILEVEL) { // bilevel
-             try {
-                 if (compression == COMP_PACKBITS) {
-                     stream.readFully(data, 0, byteCount);
-@@ -895,10 +806,10 @@
-                     // 8 pixels into 1 byte, calculate bytesInThisTile
-                     int bytesInThisTile;
-                     if ((newRect.width % 8) == 0) {
--                        bytesInThisTile = (newRect.width/8) * newRect.height;
-+                        bytesInThisTile = (newRect.width / 8) * newRect.height;
-                     } else {
-                         bytesInThisTile =
--                            (newRect.width/8 + 1) * newRect.height;
-+                            (newRect.width / 8 + 1) * newRect.height;
-                     }
-                     decodePackbits(data, bytesInThisTile, bdata);
-                 } else if (compression == COMP_LZW) {
-@@ -926,12 +837,12 @@
-             } catch (IOException ioe) {
-                 throw new RuntimeException("TIFFImage13");
-             }
--        } else if(imageType == TYPE_PALETTE) { // palette-RGB
-+        } else if (imageType == TYPE_PALETTE) { // palette-RGB
-             if (sampleSize == 16) {
- 
-                 if (decodePaletteAsShorts) {
- 
--                    short[] tempData= null;
-+                    short[] tempData = null;
- 
-                     // At this point the data is 1 banded and will
-                     // become 3 banded only after we've done the palette
-@@ -984,8 +895,8 @@
-                             // in this tile, but we need to read in shorts,
-                             // which will take half the space, so while
-                             // allocating we divide byteCount by 2.
--                            tempData = new short[byteCount/2];
--                            readShorts(byteCount/2, tempData);
-+                            tempData = new short[byteCount / 2];
-+                            readShorts(byteCount / 2, tempData);
-                         }
- 
-                         stream.seek(save_offset);
-@@ -999,16 +910,16 @@
-                         // Expand the palette image into an rgb image with ushort
-                         // data type.
-                         int cmapValue;
--                        int count = 0, lookup, len = colormap.length/3;
-+                        int count = 0, lookup, len = colormap.length / 3;
-                         int len2 = len * 2;
--                        for (int i=0; i<unitsBeforeLookup; i++) {
-+                        for (int i = 0; i < unitsBeforeLookup; i++) {
-                             // Get the index into the colormap
-                             lookup = tempData[i] & 0xffff;
-                             // Get the blue value
--                            cmapValue = colormap[lookup+len2];
-+                            cmapValue = colormap[lookup + len2];
-                             sdata[count++] = (short)(cmapValue & 0xffff);
-                             // Get the green value
--                            cmapValue = colormap[lookup+len];
-+                            cmapValue = colormap[lookup + len];
-                             sdata[count++] = (short)(cmapValue & 0xffff);
-                             // Get the red value
-                             cmapValue = colormap[lookup];
-@@ -1020,16 +931,16 @@
-                         // Expand the palette image into an rgb image with
-                         // short data type.
-                         int cmapValue;
--                        int count = 0, lookup, len = colormap.length/3;
-+                        int count = 0, lookup, len = colormap.length / 3;
-                         int len2 = len * 2;
--                        for (int i=0; i<unitsBeforeLookup; i++) {
-+                        for (int i = 0; i < unitsBeforeLookup; i++) {
-                             // Get the index into the colormap
-                             lookup = tempData[i] & 0xffff;
-                             // Get the blue value
--                            cmapValue = colormap[lookup+len2];
-+                            cmapValue = colormap[lookup + len2];
-                             sdata[count++] = (short)cmapValue;
-                             // Get the green value
--                            cmapValue = colormap[lookup+len];
-+                            cmapValue = colormap[lookup + len];
-                             sdata[count++] = (short)cmapValue;
-                             // Get the red value
-                             cmapValue = colormap[lookup];
-@@ -1084,7 +995,7 @@
- 
-                         } else if (compression == COMP_NONE) {
- 
--                            readShorts(byteCount/2, sdata);
-+                            readShorts(byteCount / 2, sdata);
-                         }
- 
-                         stream.seek(save_offset);
-@@ -1098,7 +1009,7 @@
- 
-                 if (decodePaletteAsShorts) {
- 
--                    byte[] tempData= null;
-+                    byte[] tempData = null;
- 
-                     // At this point the data is 1 banded and will
-                     // become 3 banded only after we've done the palette
-@@ -1121,25 +1032,6 @@
-                             tempData = new byte[unitsBeforeLookup];
-                             lzwDecoder.decode(data, tempData, newRect.height);
- 
--                        } else if (compression == COMP_JPEG_TTN2) {
--
--                            stream.readFully(data, 0, byteCount);
--                            Raster tempTile = decodeJPEG(data,
--                                                         decodeParam,
--                                                         colorConvertJPEG,
--                                                         tile.getMinX(),
--                                                         tile.getMinY());
--                            int[] tempPixels = new int[unitsBeforeLookup];
--                            tempTile.getPixels(tile.getMinX(),
--                                               tile.getMinY(),
--                                               tile.getWidth(),
--                                               tile.getHeight(),
--                                               tempPixels);
--                            tempData = new byte[unitsBeforeLookup];
--                            for(int i = 0; i < unitsBeforeLookup; i++) {
--                                tempData[i] = (byte)tempPixels[i];
--                            }
--
-                         }  else if (compression == COMP_DEFLATE) {
- 
-                             stream.readFully(data, 0, byteCount);
-@@ -1150,6 +1042,9 @@
- 
-                             tempData = new byte[byteCount];
-                             stream.readFully(tempData, 0, byteCount);
-+                        } else {
-+                            throw new RuntimeException(
-+                                    "Compression type not supported: " + compression);
-                         }
- 
-                         stream.seek(save_offset);
-@@ -1161,16 +1056,16 @@
-                     // Expand the palette image into an rgb image with ushort
-                     // data type.
-                     int cmapValue;
--                    int count = 0, lookup, len = colormap.length/3;
-+                    int count = 0, lookup, len = colormap.length / 3;
-                     int len2 = len * 2;
--                    for (int i=0; i<unitsBeforeLookup; i++) {
-+                    for (int i = 0; i < unitsBeforeLookup; i++) {
-                         // Get the index into the colormap
-                         lookup = tempData[i] & 0xff;
-                         // Get the blue value
--                        cmapValue = colormap[lookup+len2];
-+                        cmapValue = colormap[lookup + len2];
-                         sdata[count++] = (short)(cmapValue & 0xffff);
-                         // Get the green value
--                        cmapValue = colormap[lookup+len];
-+                        cmapValue = colormap[lookup + len];
-                         sdata[count++] = (short)(cmapValue & 0xffff);
-                         // Get the red value
-                         cmapValue = colormap[lookup];
-@@ -1193,15 +1088,6 @@
-                             stream.readFully(data, 0, byteCount);
-                             lzwDecoder.decode(data, bdata, newRect.height);
- 
--                        } else if (compression == COMP_JPEG_TTN2) {
--
--                            stream.readFully(data, 0, byteCount);
--                            tile.setRect(decodeJPEG(data,
--                                                    decodeParam,
--                                                    colorConvertJPEG,
--                                                    tile.getMinX(),
--                                                    tile.getMinY()));
--
-                         }  else if (compression == COMP_DEFLATE) {
- 
-                             stream.readFully(data, 0, byteCount);
-@@ -1210,6 +1096,10 @@
-                         } else if (compression == COMP_NONE) {
- 
-                             stream.readFully(bdata, 0, byteCount);
-+
-+                        } else {
-+                            throw new RuntimeException(
-+                                    "Compression type not supported: " + compression);
-                         }
- 
-                         stream.seek(save_offset);
-@@ -1222,8 +1112,7 @@
-             } else if (sampleSize == 4) {
- 
-                 int padding = (newRect.width % 2 == 0) ? 0 : 1;
--                int bytesPostDecoding = ((newRect.width/2 + padding) *
--                                         newRect.height);
-+                int bytesPostDecoding = ((newRect.width / 2 + padding) * newRect.height);
- 
-                 // Output short images
-                 if (decodePaletteAsShorts) {
-@@ -1264,8 +1153,8 @@
-                     data = new byte[bytes];
- 
-                     int srcCount = 0, dstCount = 0;
--                    for (int j=0; j<newRect.height; j++) {
--                        for (int i=0; i<newRect.width/2; i++) {
-+                    for (int j = 0; j < newRect.height; j++) {
-+                        for (int i = 0; i < newRect.width / 2; i++) {
-                             data[dstCount++] =
-                                 (byte)((tempData[srcCount] & 0xf0) >> 4);
-                             data[dstCount++] =
-@@ -1278,15 +1167,15 @@
-                         }
-                     }
- 
--                    int len = colormap.length/3;
--                    int len2 = len*2;
-+                    int len = colormap.length / 3;
-+                    int len2 = len * 2;
-                     int cmapValue, lookup;
-                     int count = 0;
--                    for (int i=0; i<bytes; i++) {
-+                    for (int i = 0; i < bytes; i++) {
-                         lookup = data[i] & 0xff;
--                        cmapValue = colormap[lookup+len2];
-+                        cmapValue = colormap[lookup + len2];
-                         sdata[count++] = (short)(cmapValue & 0xffff);
--                        cmapValue = colormap[lookup+len];
-+                        cmapValue = colormap[lookup + len];
-                         sdata[count++] = (short)(cmapValue & 0xffff);
-                         cmapValue = colormap[lookup];
-                         sdata[count++] = (short)(cmapValue & 0xffff);
-@@ -1324,7 +1213,7 @@
-                     }
-                 }
-             }
--        } else if(imageType == TYPE_GRAY_4BIT) { // 4-bit gray
-+        } else if (imageType == TYPE_GRAY_4BIT) { // 4-bit gray
-             try {
-                 if (compression == COMP_PACKBITS) {
- 
-@@ -1334,9 +1223,9 @@
-                     // 2 pixels into 1 byte, calculate bytesInThisTile
-                     int bytesInThisTile;
-                     if ((newRect.width % 8) == 0) {
--                        bytesInThisTile = (newRect.width/2) * newRect.height;
-+                        bytesInThisTile = (newRect.width / 2) * newRect.height;
-                     } else {
--                        bytesInThisTile = (newRect.width/2 + 1) *
-+                        bytesInThisTile = (newRect.width / 2 + 1) *
-                             newRect.height;
-                     }
- 
-@@ -1379,25 +1268,21 @@
-                         stream.readFully(data, 0, byteCount);
-                         decodePackbits(data, unitsInThisTile, bdata);
- 
--                    } else if (compression == COMP_JPEG_TTN2) {
--
--                        stream.readFully(data, 0, byteCount);
--                        tile.setRect(decodeJPEG(data,
--                                                decodeParam,
--                                                colorConvertJPEG,
--                                                tile.getMinX(),
--                                                tile.getMinY()));
-                     } else if (compression == COMP_DEFLATE) {
- 
-                         stream.readFully(data, 0, byteCount);
-                         inflate(data, bdata);
-+
-+                    } else {
-+                        throw new RuntimeException(
-+                                "Compression type not supported: " + compression);
-                     }
- 
-                 } else if (sampleSize == 16) {
- 
-                     if (compression == COMP_NONE) {
- 
--                        readShorts(byteCount/2, sdata);
-+                        readShorts(byteCount / 2, sdata);
- 
-                     } else if (compression == COMP_LZW) {
- 
-@@ -1441,7 +1326,7 @@
-                            dataType == DataBuffer.TYPE_INT) { // redundant
-                     if (compression == COMP_NONE) {
- 
--                        readInts(byteCount/4, idata);
-+                        readInts(byteCount / 4, idata);
- 
-                     } else if (compression == COMP_LZW) {
- 
-@@ -1490,10 +1375,10 @@
-             }
- 
-             // Modify the data for certain special cases.
--            switch(imageType) {
-+            switch (imageType) {
-             case TYPE_GRAY:
-             case TYPE_GRAY_ALPHA:
--                if(isWhiteZero) {
-+                if (isWhiteZero) {
-                     // Since we are using a ComponentColorModel with this
-                     // image, we need to change the WhiteIsZero data to
-                     // BlackIsZero data so it will display properly.
-@@ -1529,23 +1414,23 @@
-                 // Change RGB to BGR order, as Java2D displays that faster.
-                 // Unnecessary for JPEG-in-TIFF as the decoder handles it.
-                 if (sampleSize == 8 && compression != COMP_JPEG_TTN2) {
--                    for (int i=0; i<unitsInThisTile; i+=3) {
-+                    for (int i = 0; i < unitsInThisTile; i += 3) {
-                         bswap = bdata[i];
--                        bdata[i] = bdata[i+2];
--                        bdata[i+2] = bswap;
-+                        bdata[i] = bdata[i + 2];
-+                        bdata[i + 2] = bswap;
-                     }
-                 } else if (sampleSize == 16) {
--                    for (int i=0; i<unitsInThisTile; i+=3) {
-+                    for (int i = 0; i < unitsInThisTile; i += 3) {
-                         sswap = sdata[i];
--                        sdata[i] = sdata[i+2];
--                        sdata[i+2] = sswap;
-+                        sdata[i] = sdata[i + 2];
-+                        sdata[i + 2] = sswap;
-                     }
-                 } else if (sampleSize == 32) {
--                    if(dataType == DataBuffer.TYPE_INT) {
--                        for (int i=0; i<unitsInThisTile; i+=3) {
-+                    if (dataType == DataBuffer.TYPE_INT) {
-+                        for (int i = 0; i < unitsInThisTile; i += 3) {
-                             iswap = idata[i];
--                            idata[i] = idata[i+2];
--                            idata[i+2] = iswap;
-+                            idata[i] = idata[i + 2];
-+                            idata[i + 2] = iswap;
-                         }
-                     }
-                 }
-@@ -1553,41 +1438,41 @@
-             case TYPE_RGB_ALPHA:
-                 // Convert from RGBA to ABGR for Java2D
-                 if (sampleSize == 8) {
--                    for (int i=0; i<unitsInThisTile; i+=4) {
-+                    for (int i = 0; i < unitsInThisTile; i += 4) {
-                         // Swap R and A
-                         bswap = bdata[i];
--                        bdata[i] = bdata[i+3];
--                        bdata[i+3] = bswap;
-+                        bdata[i] = bdata[i + 3];
-+                        bdata[i + 3] = bswap;
- 
-                         // Swap G and B
--                        bswap = bdata[i+1];
--                        bdata[i+1] = bdata[i+2];
--                        bdata[i+2] = bswap;
-+                        bswap = bdata[i + 1];
-+                        bdata[i + 1] = bdata[i + 2];
-+                        bdata[i + 2] = bswap;
-                     }
-                 } else if (sampleSize == 16) {
--                    for (int i=0; i<unitsInThisTile; i+=4) {
-+                    for (int i = 0; i < unitsInThisTile; i += 4) {
-                         // Swap R and A
-                         sswap = sdata[i];
--                        sdata[i] = sdata[i+3];
--                        sdata[i+3] = sswap;
-+                        sdata[i] = sdata[i + 3];
-+                        sdata[i + 3] = sswap;
- 
-                         // Swap G and B
--                        sswap = sdata[i+1];
--                        sdata[i+1] = sdata[i+2];
--                        sdata[i+2] = sswap;
-+                        sswap = sdata[i + 1];
-+                        sdata[i + 1] = sdata[i + 2];
-+                        sdata[i + 2] = sswap;
-                     }
-                 } else if (sampleSize == 32) {
--                    if(dataType == DataBuffer.TYPE_INT) {
--                        for (int i=0; i<unitsInThisTile; i+=4) {
-+                    if (dataType == DataBuffer.TYPE_INT) {
-+                        for (int i = 0; i < unitsInThisTile; i += 4) {
-                             // Swap R and A
-                             iswap = idata[i];
--                            idata[i] = idata[i+3];
--                            idata[i+3] = iswap;
-+                            idata[i] = idata[i + 3];
-+                            idata[i + 3] = iswap;
- 
-                             // Swap G and B
--                            iswap = idata[i+1];
--                            idata[i+1] = idata[i+2];
--                            idata[i+2] = iswap;
-+                            iswap = idata[i + 1];
-+                            idata[i + 1] = idata[i + 2];
-+                            idata[i + 2] = iswap;
-                         }
-                     }
-                 }
-@@ -1595,15 +1480,15 @@
-             case TYPE_YCBCR_SUB:
-                 // Post-processing for YCbCr with subsampled chrominance:
-                 // simply replicate the chroma channels for displayability.
--                int pixelsPerDataUnit = chromaSubH*chromaSubV;
-+                int pixelsPerDataUnit = chromaSubH * chromaSubV;
- 
--                int numH = newRect.width/chromaSubH;
--                int numV = newRect.height/chromaSubV;
-+                int numH = newRect.width / chromaSubH;
-+                int numV = newRect.height / chromaSubV;
- 
--                byte[] tempData = new byte[numH*numV*(pixelsPerDataUnit + 2)];
-+                byte[] tempData = new byte[numH * numV * (pixelsPerDataUnit + 2)];
-                 System.arraycopy(bdata, 0, tempData, 0, tempData.length);
- 
--                int samplesPerDataUnit = pixelsPerDataUnit*3;
-+                int samplesPerDataUnit = pixelsPerDataUnit * 3;
-                 int[] pixels = new int[samplesPerDataUnit];
- 
-                 int bOffset = 0;
-@@ -1611,13 +1496,13 @@
-                 int offsetCr = offsetCb + 1;
- 
-                 int y = newRect.y;
--                for(int j = 0; j < numV; j++) {
-+                for (int j = 0; j < numV; j++) {
-                     int x = newRect.x;
--                    for(int i = 0; i < numH; i++) {
-+                    for (int i = 0; i < numH; i++) {
-                         int Cb = tempData[bOffset + offsetCb];
-                         int Cr = tempData[bOffset + offsetCr];
-                         int k = 0;
--                        while(k < samplesPerDataUnit) {
-+                        while (k < samplesPerDataUnit) {
-                             pixels[k++] = tempData[bOffset++];
-                             pixels[k++] = Cb;
-                             pixels[k++] = Cr;
-@@ -1679,7 +1564,7 @@
- 
-         if (isBigEndian) {
- 
--            for (int i=0; i<shortCount; i++) {
-+            for (int i = 0; i < shortCount; i++) {
-                 firstByte = byteArray[j++] & 0xff;
-                 secondByte = byteArray[j++] & 0xff;
-                 shortArray[i] = (short)((firstByte << 8) + secondByte);
-@@ -1687,7 +1572,7 @@
- 
-         } else {
- 
--            for (int i=0; i<shortCount; i++) {
-+            for (int i = 0; i < shortCount; i++) {
-                 firstByte = byteArray[j++] & 0xff;
-                 secondByte = byteArray[j++] & 0xff;
-                 shortArray[i] = (short)((secondByte << 8) + firstByte);
-@@ -1705,7 +1590,7 @@
- 
-         if (isBigEndian) {
- 
--            for (int i=0; i<intCount; i++) {
-+            for (int i = 0; i < intCount; i++) {
-                 intArray[i] = (((byteArray[j++] & 0xff) << 24) |
-                                ((byteArray[j++] & 0xff) << 16) |
-                                ((byteArray[j++] & 0xff) << 8) |
-@@ -1714,7 +1599,7 @@
- 
-         } else {
- 
--            for (int i=0; i<intCount; i++) {
-+            for (int i = 0; i < intCount; i++) {
-                 intArray[i] = ((byteArray[j++] & 0xff) |
-                               ((byteArray[j++] & 0xff) << 8) |
-                               ((byteArray[j++] & 0xff) << 16) |
-@@ -1742,7 +1627,7 @@
-                 if (b >= 0 && b <= 127) {
- 
-                     // literal run packet
--                    for (int i=0; i<(b + 1); i++) {
-+                    for (int i = 0; i < (b + 1); i++) {
-                         dst[dstCount++] = data[srcCount++];
-                     }
- 
-@@ -1750,7 +1635,7 @@
- 
-                     // 2 byte encoded run packet
-                     repeat = data[srcCount++];
--                    for (int i=0; i<(-b + 1); i++) {
-+                    for (int i = 0; i < (-b + 1); i++) {
-                         dst[dstCount++] = repeat;
-                     }
- 
-@@ -1803,7 +1688,7 @@
-         }
- 
-         RGBBits = new int[numBands];
--        for(int i = 0; i < numBands; i++) {
-+        for (int i = 0; i < numBands; i++) {
-             RGBBits[i] = componentSize;
-         }
- 
-diff -r 5073426893de xmlgraphics-commons-1.4/src/java/org/apache/xmlgraphics/java2d/ps/PSTilingPattern.java
---- src/java/org/apache/xmlgraphics/java2d/ps/PSTilingPattern.java	Tue Feb 21 12:29:55 2012 +0100
-+++ src/java/org/apache/xmlgraphics/java2d/ps/PSTilingPattern.java	Tue Feb 21 12:50:48 2012 +0100
-@@ -51,7 +51,7 @@
-     protected String patternName = null;
- 
-     /**
--     * The XUID is an extended unique ID — an array of integers that provides for
-+     * The XUID is an extended unique ID � an array of integers that provides for
-      * distributed, hierarchical management of the space of unique ID numbers
-      * (optional)
-      */
-@@ -65,7 +65,7 @@
-     /**
-      * An array of four numbers in the pattern coordinate system, giving
-      * the coordinates of the left, bottom, right, and top edges, respectively, of the
--     * pattern cell’s bounding box
-+     * pattern cell's bounding box
-      */
-     protected Rectangle2D bBox = null;
- 
-@@ -108,7 +108,7 @@
-      * the name is null, the pattern should be stored in PSPatternStorage, where the pattern
-      * gets a name (the pattern without name cannot be use in PS file)
-      * @param paintProc a postscript procedure for painting the pattern cell
--     * @param bBox a pattern cell’s bounding box
-+     * @param bBox a pattern cell's bounding box
-      * @param xStep the desired horizontal spacing between pattern cells
-      * @param yStep the desired vertical spacing between pattern cells
-      * @param paintType 1 for colored pattern, 2 for uncolored pattern
-@@ -192,7 +192,7 @@
-     /**
-      * Returns the bounding box.
-      *
--     * @return a pattern cell’s bounding box
-+     * @return a pattern cell's bounding box
-      */
-     public Rectangle2D getBoundingBox() {
-         return (this.bBox);
-@@ -201,7 +201,7 @@
-     /**
-      * Sets the bounding box.
-      *
--     * @param bBox a pattern cell’s bounding box
-+     * @param bBox a pattern cell's bounding box
-      */
-     public void setBoundingBox(Rectangle2D bBox) {
-         if (bBox == null) {
-@@ -392,9 +392,9 @@
-             }
- 
-             // define color image: width height bits/comp matrix
--            //                        datasrc0 … datasrcncomp-1 multi ncomp colorimage
-+            //                        datasrc0 datasrcncomp-1 multi ncomp colorimage
-             sb.append(width + " " + height + " 8 " + "matrix\n");   // width height bits/comp matrix
--            int [] argb = new int[width * height];                  // datasrc0 … datasrcncomp-1
-+            int [] argb = new int[width * height];                  // datasrc0 datasrcncomp-1
-             sb.append("{<");
-             texture.getImage().getRGB(0, 0, width, height, argb, 0, width);
-             int count = 0;
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 1d17403..92ae911 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
-Version:        1.4
-Release:        7%{?dist}
+Version:        1.5
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -8,20 +8,19 @@ Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://xmlgraphics.apache.org/
 Source0:        http://apache.skknet.net/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz
-Patch0:         %{name}-java-7-fix.patch
 
 BuildArch:      noarch
 BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  jpackage-utils
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit
-BuildRequires:  apache-commons-io >= 0:1.1
-BuildRequires:  apache-commons-logging >= 0:1.0.4
-Requires:       apache-commons-logging >= 0:1.0.4
-Requires:       apache-commons-io >= 0:1.1
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
+BuildRequires:  apache-commons-io >= 1.3.1
+BuildRequires:  apache-commons-logging >= 1.0.4
+Requires:       java
+Requires:       jpackage-utils
+Requires:       apache-commons-io >= 1.3.1
+Requires:       apache-commons-logging >= 1.0.4
 
 %description
 Apache XML Graphics Commons is a library that consists of
@@ -44,7 +43,6 @@ Requires:       jpackage-utils
 %prep
 %setup -q %{name}-%{version}
 rm -f `find . -name "*.jar"`
-%patch0
 
 # create pom from template
 sed "s:@version@:%{version}:g" %{name}-pom-template.pom \
@@ -63,17 +61,11 @@ ant package javadocs
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -Dpm 0644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 install -pm 644 %{name}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.xmlgraphics %{name} %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %doc LICENSE NOTICE README
 %{_mavendepmapfragdir}/%{name}
@@ -86,6 +78,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Mar 19 2013 Mat Booth <fedora@matbooth.co.uk> - 0:1.5-1
+- Update to 1.5, rhbz #895934
+- Drop unneeded patch
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From 4489cdbdf5b61ce133ccd2aaf3d33425abc42c3e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 03:30:30 -0500
Subject: [PATCH 11/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 92ae911..5c5cbdb 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -78,6 +78,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue Mar 19 2013 Mat Booth <fedora@matbooth.co.uk> - 0:1.5-1
 - Update to 1.5, rhbz #895934
 - Drop unneeded patch

From 3dc575985093b5a2c14c480720a8d267b087f420 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 8 Jun 2014 01:06:58 -0500
Subject: [PATCH 12/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 5c5cbdb..d279089 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -78,6 +78,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From ab3511d7f8357a33ca60819c400c234ed96ddbfa Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 4 Aug 2014 14:14:28 +0200
Subject: [PATCH 13/55] Update to current packaging guidelines

- Resolves: rhbz#1107290
---
 xmlgraphics-commons.spec | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index d279089..c9193d4 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        1.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -61,16 +61,13 @@ ant package javadocs
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -Dpm 0644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 install -pm 644 %{name}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%files
+%files -f .mfiles
 %doc LICENSE NOTICE README
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_javadir}/*.jar
 
 %files javadoc
 %doc LICENSE NOTICE
@@ -78,6 +75,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Mon Aug  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5-4
+- Update to current packaging guidelines
+- Resolves: rhbz#1107290
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From d6c9a2fe7b772ec08803be7390539502bb217ce6 Mon Sep 17 00:00:00 2001
From: Ruediger Landmann <r.landmann@redhat.com>
Date: Fri, 30 Jan 2015 16:33:46 +1000
Subject: [PATCH 14/55] rebase on new upstream

---
 .gitignore               | 1 +
 sources                  | 2 +-
 xmlgraphics-commons.spec | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d887074..fb2e593 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xmlgraphics-commons-1.3-src.tar.gz
 xmlgraphics-commons-1.3.1-src.tar.gz
 /xmlgraphics-commons-1.5-src.tar.gz
+/xmlgraphics-commons-2.0-src.tar.gz
diff --git a/sources b/sources
index 0f34c91..e3e9f5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7012400a3c9d10a18bc5c3515610f35  xmlgraphics-commons-1.5-src.tar.gz
+f970745b10f7add8c2cabec90d0a6b46  xmlgraphics-commons-2.0-src.tar.gz
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index c9193d4..5cf7d0a 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
-Version:        1.5
-Release:        4%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -75,6 +75,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Fri Jan 30 2015 Rüdiger Landmann <rlandmann@redhat.com> - 0:2.0-1
+- Rebase on new upstream
+
 * Mon Aug  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.5-4
 - Update to current packaging guidelines
 - Resolves: rhbz#1107290

From c70d25810ac0ba4634102ec6e17c9030b7f3381d Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 04:09:03 +0000
Subject: [PATCH 15/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 5cf7d0a..f2b2bd7 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -75,6 +75,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Fri Jan 30 2015 Rüdiger Landmann <rlandmann@redhat.com> - 0:2.0-1
 - Rebase on new upstream
 

From bc3ebf2abdbf6a9db12810e32333ba722b23374f Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 14 Jul 2015 17:37:27 +0200
Subject: [PATCH 16/55] Update to upstream version 2.0.1

---
 .gitignore               |  1 +
 sources                  |  2 +-
 xmlgraphics-commons.spec | 15 +++++++--------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index fb2e593..32c7b74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ xmlgraphics-commons-1.3-src.tar.gz
 xmlgraphics-commons-1.3.1-src.tar.gz
 /xmlgraphics-commons-1.5-src.tar.gz
 /xmlgraphics-commons-2.0-src.tar.gz
+/xmlgraphics-commons-2.0.1-src.tar.gz
diff --git a/sources b/sources
index e3e9f5e..d227ec8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f970745b10f7add8c2cabec90d0a6b46  xmlgraphics-commons-2.0-src.tar.gz
+d8b3b07116e5387c760f4fe6dbe598c0  xmlgraphics-commons-2.0.1-src.tar.gz
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index f2b2bd7..a2d823c 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,24 +1,22 @@
 Name:           xmlgraphics-commons
-Version:        2.0
-Release:        2%{?dist}
+Version:        2.0.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://xmlgraphics.apache.org/
-Source0:        http://apache.skknet.net/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz
+Source0:        http://apache.org/dist/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils
+BuildRequires:  javapackages-local
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit
 BuildRequires:  apache-commons-io >= 1.3.1
 BuildRequires:  apache-commons-logging >= 1.0.4
 Requires:       java
-Requires:       jpackage-utils
 Requires:       apache-commons-io >= 1.3.1
 Requires:       apache-commons-logging >= 1.0.4
 
@@ -33,8 +31,6 @@ PostScript files, and much more.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description    javadoc
 %{summary}.
@@ -75,6 +71,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Jul 14 2015 Michael Simacek <msimacek@redhat.com> - 0:2.0.1-1
+- Update to upstream version 2.0.1
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From c11873e748c68a2c482e9716809812d3013b717b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 03:36:12 +0000
Subject: [PATCH 17/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index a2d823c..d4fecc2 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -71,6 +71,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Tue Jul 14 2015 Michael Simacek <msimacek@redhat.com> - 0:2.0.1-1
 - Update to upstream version 2.0.1
 

From ab4c96f0d2b06cc14bde315d5ea9d7421f101dbd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 17:57:33 +0000
Subject: [PATCH 18/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index d4fecc2..1270a85 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -71,6 +71,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 3f630ab736d31a1be800153fce5388097024abf6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 22:13:42 +0000
Subject: [PATCH 19/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 1270a85..f91f4c5 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -71,6 +71,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From f9b054d772b0c5dc9c8f1b5dc0848bf594e1b224 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 16 Jan 2018 16:04:18 +0100
Subject: [PATCH 20/55] Install with XMvn

---
 xmlgraphics-commons.spec | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index f91f4c5..e29387f 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -16,9 +16,7 @@ BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit
 BuildRequires:  apache-commons-io >= 1.3.1
 BuildRequires:  apache-commons-logging >= 1.0.4
-Requires:       java
-Requires:       apache-commons-io >= 1.3.1
-Requires:       apache-commons-logging >= 1.0.4
+BuildRequires:  apache-parent
 
 %description
 Apache XML Graphics Commons is a library that consists of
@@ -54,23 +52,23 @@ popd
 ant package javadocs
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -Dpm 0644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -pm 644 %{name}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+%mvn_file : %{name}
+%mvn_artifact %{name}.pom build/%{name}-%{version}.jar
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install -J build/javadocs
 
 %files -f .mfiles
-%doc LICENSE NOTICE README
+%license LICENSE NOTICE
+%doc README
 
-%files javadoc
-%doc LICENSE NOTICE
-%doc %{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license LICENSE NOTICE
 
 
 %changelog
+* Tue Jan 16 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0.1-5
+- Install with XMvn
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 17e0cddede5eb491b32f5f4e5ce916ed937754f1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 21:47:08 +0000
Subject: [PATCH 21/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index e29387f..0e40d5d 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.0.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -66,6 +66,9 @@ ant package javadocs
 
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Tue Jan 16 2018 Michael Simacek <msimacek@redhat.com> - 0:2.0.1-5
 - Install with XMvn
 

From 01cd68834211d1aab42edb793ab842386259f6f5 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 26 Apr 2018 10:44:27 +0100
Subject: [PATCH 22/55] Update to latest release Switch to maven-based build
 Add OSGi metadata

---
 .gitignore               |  1 +
 sources                  |  2 +-
 xmlgraphics-commons.spec | 68 ++++++++++++++++++++++------------------
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 32c7b74..45aab53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ xmlgraphics-commons-1.3.1-src.tar.gz
 /xmlgraphics-commons-1.5-src.tar.gz
 /xmlgraphics-commons-2.0-src.tar.gz
 /xmlgraphics-commons-2.0.1-src.tar.gz
+/xmlgraphics-commons-2.2-src.tar.gz
diff --git a/sources b/sources
index d227ec8..0c19da9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8b3b07116e5387c760f4fe6dbe598c0  xmlgraphics-commons-2.0.1-src.tar.gz
+SHA512 (xmlgraphics-commons-2.2-src.tar.gz) = c0c786e774da535d7ed100c3c78ba1483fde371b7353226bb72076aab39ad33e752fa9d85fd368f65cfb50cc25ae904868d8f939323ea96876523e09f1259211
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 0e40d5d..de29cb7 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,22 +1,22 @@
 Name:           xmlgraphics-commons
-Version:        2.0.1
-Release:        6%{?dist}
+Version:        2.2
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
 License:        ASL 2.0
 URL:            http://xmlgraphics.apache.org/
-Source0:        http://apache.org/dist/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  javapackages-local
-BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-junit >= 0:1.6
-BuildRequires:  junit
-BuildRequires:  apache-commons-io >= 1.3.1
-BuildRequires:  apache-commons-logging >= 1.0.4
-BuildRequires:  apache-parent
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(commons-logging:commons-logging)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.mockito:mockito-core)
+BuildRequires:  mvn(xml-resolver:xml-resolver)
 
 %description
 Apache XML Graphics Commons is a library that consists of
@@ -27,35 +27,37 @@ 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}
-
-%description    javadoc
-%{summary}.
+%package javadoc
+Summary: Javadoc for %{name}
 
+%description javadoc
+This package contains API documentation for %{name}.
 
 %prep
 %setup -q %{name}-%{version}
-rm -f `find . -name "*.jar"`
 
-# create pom from template
-sed "s:@version@:%{version}:g" %{name}-pom-template.pom \
-    > %{name}.pom
+find -name "*.jar" -delete
 
+# Disable plugins not needed for RPM build
+%pom_remove_plugin :maven-checkstyle-plugin
+%pom_remove_plugin :findbugs-maven-plugin
+
+# Make into OSGi bundle
+%pom_xpath_inject pom:project '<packaging>bundle</packaging>'
+%pom_add_plugin org.apache.felix:maven-bundle-plugin . \
+" <extensions>true</extensions>
+  <configuration>
+    <instructions>
+      <Bundle-SymbolicName>org.apache.xmlgraphics</Bundle-SymbolicName>
+    </instructions>
+  </configuration>"
 
 %build
-export CLASSPATH=$(build-classpath commons-logging)
-export OPT_JAR_LIST="ant/ant-junit junit"
-pushd lib
-ln -sf $(build-classpath commons-io) .
-popd
-ant package javadocs
+%mvn_file : %{name}
+%mvn_build
 
 %install
-%mvn_file : %{name}
-%mvn_artifact %{name}.pom build/%{name}-%{version}.jar
-
-%mvn_install -J build/javadocs
+%mvn_install
 
 %files -f .mfiles
 %license LICENSE NOTICE
@@ -64,8 +66,12 @@ ant package javadocs
 %files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE
 
-
 %changelog
+* Thu Apr 26 2018 Mat Booth <mat.booth@redhat.com> - 0:2.2-1
+- Update to latest release
+- Switch to maven-based build
+- Add OSGi metadata
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From e3064a17deefc2a4e3b765f00b9df10d3474f749 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 09:23:35 +0000
Subject: [PATCH 23/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index de29cb7..dca0a82 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Thu Apr 26 2018 Mat Booth <mat.booth@redhat.com> - 0:2.2-1
 - Update to latest release
 - Switch to maven-based build

From 4eb074f7b66712359cff6d465b3120aacf943ae4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 3 Feb 2019 12:33:16 +0000
Subject: [PATCH 24/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index dca0a82..e8b4110 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 047db54f2c389cb5afcdf5720183c79844ac6377 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Wed, 15 May 2019 16:02:45 +0100
Subject: [PATCH 25/55] Update to latest upstream release

---
 .gitignore               | 8 ++------
 sources                  | 2 +-
 xmlgraphics-commons.spec | 7 +++++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45aab53..eb74f1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
-xmlgraphics-commons-1.3-src.tar.gz
-xmlgraphics-commons-1.3.1-src.tar.gz
-/xmlgraphics-commons-1.5-src.tar.gz
-/xmlgraphics-commons-2.0-src.tar.gz
-/xmlgraphics-commons-2.0.1-src.tar.gz
-/xmlgraphics-commons-2.2-src.tar.gz
+/xmlgraphics-commons-*-src.tar.gz
+/*.src.rpm
diff --git a/sources b/sources
index 0c19da9..c9e1563 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.2-src.tar.gz) = c0c786e774da535d7ed100c3c78ba1483fde371b7353226bb72076aab39ad33e752fa9d85fd368f65cfb50cc25ae904868d8f939323ea96876523e09f1259211
+SHA512 (xmlgraphics-commons-2.3-src.tar.gz) = bcca47dd3be8371fccddb5c9f41485f53fc3c54cdfb4037af89955447137ed075f96d8c1aa6890d0cdaa265c31072bffcc7b6a6aa43dc1945ef153a840431b97
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index e8b4110..c7ba43f 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
-Version:        2.2
-Release:        3%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Wed May 15 2019 Mat Booth <mat.booth@redhat.com> - 0:2.3-1
+- Update to latest upstream release
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 36ebead96576fc670fd5391495c97b4a63dabf4a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jul 2019 04:20:57 +0000
Subject: [PATCH 26/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index c7ba43f..520d6db 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Wed May 15 2019 Mat Booth <mat.booth@redhat.com> - 0:2.3-1
 - Update to latest upstream release
 

From 9303e8ad00ab574dbb0870cb28736e61266e90b0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 31 Jan 2020 04:36:13 +0000
Subject: [PATCH 27/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 520d6db..736f1e2 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 533b201c471506e15d683be46015e610332c31ea Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Sat, 11 Jul 2020 08:50:00 +0200
Subject: [PATCH 28/55] Rebuilt for JDK-11

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 736f1e2..43e447b 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.3-4
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 15388402d80aba6f41daf108ef2045b4eadd40a3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 14:50:19 +0000
Subject: [PATCH 29/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 43e447b..7743a78 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:2.3-4
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
 

From 7cfaf7ee62d45053f6de0ec484e43a851cff8c97 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Sun, 1 Nov 2020 20:39:47 +0000
Subject: [PATCH 30/55] Update to latest upstream release

---
 sources                  | 2 +-
 xmlgraphics-commons.spec | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index c9e1563..4be9686 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.3-src.tar.gz) = bcca47dd3be8371fccddb5c9f41485f53fc3c54cdfb4037af89955447137ed075f96d8c1aa6890d0cdaa265c31072bffcc7b6a6aa43dc1945ef153a840431b97
+SHA512 (xmlgraphics-commons-2.4-src.tar.gz) = f3a7f34d30b1e3957509c3a1a37ca3996eb4d4dada71b85877f7193fbcd0d1465bfd63a91941446ef83559c9ba40b3115dfa42a28b83bd49f9f9d5bb1c2cca74
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 7743a78..dd50eb7 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
-Version:        2.3
-Release:        5%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sun Nov 01 2020 Mat Booth <mat.booth@redhat.com> - 0:2.4-1
+- Update to latest upstream release
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 66607829eee210fe1d4d859211fb0a6640eec545 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 28 Jan 2021 00:09:41 +0000
Subject: [PATCH 31/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index dd50eb7..285fe2e 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Sun Nov 01 2020 Mat Booth <mat.booth@redhat.com> - 0:2.4-1
 - Update to latest upstream release
 

From a3661164cde39bd6a5976b8f701768f19edbc196 Mon Sep 17 00:00:00 2001
From: Jie Kang <jkang@redhat.com>
Date: Mon, 1 Mar 2021 14:41:39 -0500
Subject: [PATCH 32/55] Update to 2.6

---
 sources                  | 2 +-
 xmlgraphics-commons.spec | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index 4be9686..7089618 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.4-src.tar.gz) = f3a7f34d30b1e3957509c3a1a37ca3996eb4d4dada71b85877f7193fbcd0d1465bfd63a91941446ef83559c9ba40b3115dfa42a28b83bd49f9f9d5bb1c2cca74
+SHA512 (xmlgraphics-commons-2.6-src.tar.gz) = bdf7fb21d076ba722648da016b0686ed3ea6f56b8ba1a8cea34b517095bf91ff900a937e45aba0977389ab736b1815a5733908ad4242911246555dce61cf4cfd
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 285fe2e..ae31afb 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
-Version:        2.4
-Release:        2%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Mon Mar 01 2021 Jie Kang <jkang@redhat.com> - 0:2.6-1
+- Update to latest upstream release
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 5c0ac2eb836b8895ae358c55f9e0f1b0e0c3109d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 21:43:06 +0000
Subject: [PATCH 33/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index ae31afb..d43986d 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Mon Mar 01 2021 Jie Kang <jkang@redhat.com> - 0:2.6-1
 - Update to latest upstream release
 

From 33446336ef7a0d9307856c1bd9a2c11f79bde448 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 05:15:38 +0000
Subject: [PATCH 34/55] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index d43986d..f13596b 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 020611d46ad6d22407ffa50a1753a5074c27a3e8 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Mon, 24 Jan 2022 14:21:20 -0600
Subject: [PATCH 35/55] 2.7

---
 sources                  | 2 +-
 xmlgraphics-commons.spec | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index 7089618..96f98e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.6-src.tar.gz) = bdf7fb21d076ba722648da016b0686ed3ea6f56b8ba1a8cea34b517095bf91ff900a937e45aba0977389ab736b1815a5733908ad4242911246555dce61cf4cfd
+SHA512 (xmlgraphics-commons-2.7-src.tar.gz) = 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index f13596b..029e260 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
-Version:        2.6
-Release:        3%{?dist}
+Version:        2.7
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Mon Jan 24 2022 Gwyn Ciesla <gwync@protonmail.com> - 0:2.7-1
+- 2.7
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From f6f86976ca5e9cb407108eba54caea0d18230dbb Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Sun, 6 Feb 2022 00:44:59 +0100
Subject: [PATCH 36/55] Rebuilt for java-17-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java17
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 029e260..69fcf35 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0:2.7-2
+- Rebuilt for java-17-openjdk as system jdk
+
 * Mon Jan 24 2022 Gwyn Ciesla <gwync@protonmail.com> - 0:2.7-1
 - 2.7
 

From 14f007e09a6823379e9a74831eeaf375a88b25cc Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Fri, 8 Jul 2022 17:01:42 +0200
Subject: [PATCH 37/55] Rebuilt for Drop i686 JDKs

https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
---
 xmlgraphics-commons.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 69fcf35..5eca963 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -9,6 +9,7 @@ URL:            http://xmlgraphics.apache.org/
 Source0:        http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
 
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(commons-io:commons-io)
@@ -67,6 +68,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 0:2.7-3
+- Rebuilt for Drop i686 JDKs
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0:2.7-2
 - Rebuilt for java-17-openjdk as system jdk
 

From f9adca45289695d7b8754dd6da6e854557de343f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 13:17:33 +0000
Subject: [PATCH 38/55] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 5eca963..8fa7ee0 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -68,6 +68,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 0:2.7-3
 - Rebuilt for Drop i686 JDKs
 

From 0d291f6ecf6e863629607d840f0eab04ecfceb3d Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Thu, 10 Nov 2022 10:29:06 -0600
Subject: [PATCH 39/55] 2.8

---
 sources                  |  2 +-
 test.patch               | 21 +++++++++++++++++++++
 xmlgraphics-commons.spec | 10 ++++++++--
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 test.patch

diff --git a/sources b/sources
index 96f98e0..ef74ff3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.7-src.tar.gz) = 7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22
+SHA512 (xmlgraphics-commons-2.8-src.tar.gz) = 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b
diff --git a/test.patch b/test.patch
new file mode 100644
index 0000000..450e1dd
--- /dev/null
+++ b/test.patch
@@ -0,0 +1,21 @@
+--- xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java	2022/10/06 12:37:37	1904425
++++ xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java	2022/11/10 08:15:05	1905215
+@@ -36,9 +36,14 @@
+ 
+         ImageSessionContext sessionContext = imageContext.newSessionContext();
+         ImageManager manager = imageContext.getImageManager();
+-
+-        ImageInfo imageInfo = manager.preloadImage(uri, sessionContext);
+-        assertEquals(imageInfo.getMimeType(), "image/png");
++        try {
++            ImageInfo imageInfo = manager.preloadImage(uri, sessionContext);
++            //IOException should continue to raw png
++            assertEquals(imageInfo.getMimeType(), "image/png");
++        } catch (Exception e) {
++            //Otherwise should throw exception
++            assertEquals(e.getMessage(), "pos < flushedPos!");
++        }
+     }
+ 
+ }
+
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 8fa7ee0..1ce524f 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,12 +1,13 @@
 Name:           xmlgraphics-commons
-Version:        2.7
-Release:        4%{?dist}
+Version:        2.8
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
 License:        ASL 2.0
 URL:            http://xmlgraphics.apache.org/
 Source0:        http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
+Patch0:         test.patch
 
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
@@ -37,6 +38,8 @@ This package contains API documentation for %{name}.
 %prep
 %setup -q %{name}-%{version}
 
+%patch0 -p3
+
 find -name "*.jar" -delete
 
 # Disable plugins not needed for RPM build
@@ -68,6 +71,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Wed Nov 09 2022 Gwyn Ciesla <gwync@protonmail.com> - 0:2.8-1
+- 2.8
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 53e328aad6bec94ea8b467642b37d0c481b85690 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 07:37:46 +0000
Subject: [PATCH 40/55] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 1ce524f..e284f05 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -71,6 +71,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Nov 09 2022 Gwyn Ciesla <gwync@protonmail.com> - 0:2.8-1
 - 2.8
 

From 01d8c0ae3145347aa5ca7332769927307fa29ada Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Thu, 2 Mar 2023 15:10:31 -0600
Subject: [PATCH 41/55] migrated to SPDX license

---
 xmlgraphics-commons.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index e284f05..5aa7f5d 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,10 +1,10 @@
 Name:           xmlgraphics-commons
 Version:        2.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
-License:        ASL 2.0
+License:        Apache-2.0 
 URL:            http://xmlgraphics.apache.org/
 Source0:        http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
 Patch0:         test.patch
@@ -71,6 +71,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Thu Mar 02 2023 Gwyn Ciesla <gwync@protonmail.com> - 0:2.8-3
+- migrated to SPDX license
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 0416d453f5a5a9e57808330a18f339ff6379e450 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 19:01:41 +0000
Subject: [PATCH 42/55] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 5aa7f5d..82183e4 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -71,6 +71,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Mar 02 2023 Gwyn Ciesla <gwync@protonmail.com> - 0:2.8-3
 - migrated to SPDX license
 

From 0a4121e22a4c648a662a1da2be46bdaf6c6303e2 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Wed, 23 Aug 2023 14:00:49 -0500
Subject: [PATCH 43/55] 2.9

---
 sources                  |  2 +-
 test.patch               | 21 ---------------------
 xmlgraphics-commons.spec | 10 +++++-----
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 test.patch

diff --git a/sources b/sources
index ef74ff3..8e926d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.8-src.tar.gz) = 3e6c397a7444c4ce1d1aeda96a7c9abfd3d8d57a0997d7d6ae2be36303dd17550b7b92fd86eac832566bbeefccdd06619e31c0d907cd6b953a8eb934d7fa618b
+SHA512 (xmlgraphics-commons-2.9-src.tar.gz) = 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521
diff --git a/test.patch b/test.patch
deleted file mode 100644
index 450e1dd..0000000
--- a/test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java	2022/10/06 12:37:37	1904425
-+++ xmlgraphics/commons/trunk/src/test/java/org/apache/xmlgraphics/image/loader/CorruptImagesTestCase.java	2022/11/10 08:15:05	1905215
-@@ -36,9 +36,14 @@
- 
-         ImageSessionContext sessionContext = imageContext.newSessionContext();
-         ImageManager manager = imageContext.getImageManager();
--
--        ImageInfo imageInfo = manager.preloadImage(uri, sessionContext);
--        assertEquals(imageInfo.getMimeType(), "image/png");
-+        try {
-+            ImageInfo imageInfo = manager.preloadImage(uri, sessionContext);
-+            //IOException should continue to raw png
-+            assertEquals(imageInfo.getMimeType(), "image/png");
-+        } catch (Exception e) {
-+            //Otherwise should throw exception
-+            assertEquals(e.getMessage(), "pos < flushedPos!");
-+        }
-     }
- 
- }
-
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 82183e4..f1081bf 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,13 +1,12 @@
 Name:           xmlgraphics-commons
-Version:        2.8
-Release:        4%{?dist}
+Version:        2.9
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
 License:        Apache-2.0 
 URL:            http://xmlgraphics.apache.org/
 Source0:        http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
-Patch0:         test.patch
 
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
@@ -38,8 +37,6 @@ This package contains API documentation for %{name}.
 %prep
 %setup -q %{name}-%{version}
 
-%patch0 -p3
-
 find -name "*.jar" -delete
 
 # Disable plugins not needed for RPM build
@@ -71,6 +68,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Wed Aug 23 2023 Gwyn Ciesla <gwync@protonmail.com> - 0:2.9-1
+- 2.9
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 54986fe714c845254ca24d52ec774908efa68316 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 09:52:34 +0000
Subject: [PATCH 44/55] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index f1081bf..a1d7171 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -68,6 +68,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Aug 23 2023 Gwyn Ciesla <gwync@protonmail.com> - 0:2.9-1
 - 2.9
 

From 1dbbd60a629595db11ff6e30ae7b416c9685bf58 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 27 Feb 2024 18:34:35 +0100
Subject: [PATCH 45/55] Rebuilt for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21
---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index a1d7171..bd715a2 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -68,6 +68,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 0:2.9-3
+- Rebuilt for java-21-openjdk as system jdk
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 4d2815a7b30abd02d130ac7104be1bd090a60997 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 10:13:21 +0000
Subject: [PATCH 46/55] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index bd715a2..e649e03 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -68,6 +68,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 0:2.9-3
 - Rebuilt for java-21-openjdk as system jdk
 

From 0b7caab5a58649a30abddfdd3b18c091947482b5 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Wed, 9 Oct 2024 08:40:03 -0500
Subject: [PATCH 47/55] 2.10

---
 sources                  | 2 +-
 xmlgraphics-commons.spec | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sources b/sources
index 8e926d5..854c9d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.9-src.tar.gz) = 896a5fe41277783021075df0de1aa109a7f05416af6b0141301a2452197d85df0daef28f5c2a71802644cbff3bfe79579a1544000a4c1b5cec4c211d8effd521
+SHA512 (xmlgraphics-commons-2.10-src.tar.gz) = 49b055891e6b76f3c357b616c34f152033ccf807432d55dd57ac83c41234c224d1a716f77ae7ef24ff49d9f376dfa6b161cde18b258d94438a467a4ad91be21d
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index e649e03..c193549 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
-Version:        2.9
-Release:        4%{?dist}
+Version:        2.10
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -41,7 +41,6 @@ find -name "*.jar" -delete
 
 # Disable plugins not needed for RPM build
 %pom_remove_plugin :maven-checkstyle-plugin
-%pom_remove_plugin :findbugs-maven-plugin
 
 # Make into OSGi bundle
 %pom_xpath_inject pom:project '<packaging>bundle</packaging>'
@@ -68,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Wed Oct 09 2024 Gwyn Ciesla <gwync@protonmail.com> - 0:2.10-1
+- 2.10
+
 * Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From dcd864b2ca7c663c65614aa888b3f27cd184676c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 16:01:02 +0000
Subject: [PATCH 48/55] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index c193549..33ddcd6 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Oct 09 2024 Gwyn Ciesla <gwync@protonmail.com> - 0:2.10-1
 - 2.10
 

From 49082124daf51c39a3eec2c78cb30be9d85a0476 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Tue, 6 May 2025 08:37:54 -0500
Subject: [PATCH 49/55] 2.11

---
 sources                  | 2 +-
 xmlgraphics-commons.spec | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index 854c9d9..1bba186 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.10-src.tar.gz) = 49b055891e6b76f3c357b616c34f152033ccf807432d55dd57ac83c41234c224d1a716f77ae7ef24ff49d9f376dfa6b161cde18b258d94438a467a4ad91be21d
+SHA512 (xmlgraphics-commons-2.11-src.tar.gz) = 2249a1ca0ee26522d0a8f34af96791611dfe849278ad98b2f5a571fde662a8eef7f2594f6929f2414f57e0bcd286ed14192471556fb29c9355cb046e9c806e0c
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 33ddcd6..fff8141 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
-Version:        2.10
-Release:        2%{?dist}
+Version:        2.11
+Release:        1%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Tue May 06 2025 Gwyn Ciesla <gwync@protonmail.com> - 0:2.11-1
+- 2.11
+
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From dc210a2588873c32af24950304ced624207b1461 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 20:55:57 +0000
Subject: [PATCH 50/55] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index fff8141..23a9805 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Tue May 06 2025 Gwyn Ciesla <gwync@protonmail.com> - 0:2.11-1
 - 2.11
 

From 98aabbc2352a3d29ae65981cc5b138e02c038104 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Wed, 30 Jul 2025 01:32:34 +0200
Subject: [PATCH 51/55] Rebuilt for java-25-openjdk as preffered jdk

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
---
 xmlgraphics-commons.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 23a9805..0aca704 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -11,7 +11,7 @@ Source0:        http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgra
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(junit:junit)
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 0:2.11-3
+- Rebuilt for java-25-openjdk as preffered jdk
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

From c6ac148320c3440d413c0ec4d2a46351df42e2c9 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Wed, 30 Jul 2025 14:12:38 +0200
Subject: [PATCH 52/55] Rrevert to jdk21

during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
your package failed to build. Is preemptively reverted back to versioned jdk21
---
 xmlgraphics-commons.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 0aca704..5b25fe2 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -11,7 +11,7 @@ Source0:        http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgra
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-BuildRequires:  maven-local-openjdk25
+BuildRequires:  maven-local-openjdk21
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(junit:junit)
@@ -67,6 +67,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Wed Jul 30 2025 jiri vanek <jvanek@redhat.com> - 0:2.11-4
+- Rrevert to jdk21
+
 * Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 0:2.11-3
 - Rebuilt for java-25-openjdk as preffered jdk
 

From a25361ce60201aa50e74996b6a83f7c67e0f4a05 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 6 Jan 2026 10:33:17 +0100
Subject: [PATCH 53/55] Migrated to jdk25

---
 jdk25.patch              | 12 ++++++++++++
 xmlgraphics-commons.spec |  7 ++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 jdk25.patch

diff --git a/jdk25.patch b/jdk25.patch
new file mode 100644
index 0000000..2b6713a
--- /dev/null
+++ b/jdk25.patch
@@ -0,0 +1,12 @@
+--- xmlgraphics-commons-2.11/src/main/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java
++++ xmlgraphics-commons-2.11/src/main/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java
+@@ -228,7 +228,7 @@
+             if (padding != 0) {
+                 try {
+                     iccStream.write(new byte[padding]);
+-                } catch (IOException ioe) {
++                } catch (Exception ioe) {
+                     throw new IOException("Error while aligning ICC stream: " + ioe.getMessage());
+                 }
+             }
+
diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 5b25fe2..2d150b5 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,17 +1,18 @@
 Name:           xmlgraphics-commons
 Version:        2.11
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
 License:        Apache-2.0 
 URL:            http://xmlgraphics.apache.org/
 Source0:        http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz
+Patch1:         jdk25.patch
 
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-BuildRequires:  maven-local-openjdk21
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(junit:junit)
@@ -36,7 +37,7 @@ This package contains API documentation for %{name}.
 
 %prep
 %setup -q %{name}-%{version}
-
+patch -p1 < %{PATCH1}
 find -name "*.jar" -delete
 
 # Disable plugins not needed for RPM build

From 72e9f67e87b49c09cc30cc22ffc8a7ce9a4314c2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 20:45:36 +0000
Subject: [PATCH 54/55] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 2d150b5..038f2fe 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.11
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -68,6 +68,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Wed Jul 30 2025 jiri vanek <jvanek@redhat.com> - 0:2.11-4
 - Rrevert to jdk21
 

From 03092b4bdb893c068b3ab58e1c5bceee6c89fe7d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 09:18:25 +0000
Subject: [PATCH 55/55] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

---
 xmlgraphics-commons.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec
index 038f2fe..8f86f5c 100644
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@@ -1,6 +1,6 @@
 Name:           xmlgraphics-commons
 Version:        2.11
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons
 
@@ -68,6 +68,9 @@ find -name "*.jar" -delete
 %license LICENSE NOTICE
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.11-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.11-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild