[packages/java-xmlgraphics-commons] Release 2 (by relup.sh)

[arekm]

commit 08e5f6c471f1d6103a74d4e098627c3933139b5e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Apr 4 15:08:40 2026 +0200

    Release 2 (by relup.sh)

 java-xmlgraphics-commons.spec | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/java-xmlgraphics-commons.spec b/java-xmlgraphics-commons.spec
index c8bced3..afd34ab 100644
--- a/java-xmlgraphics-commons.spec
+++ b/java-xmlgraphics-commons.spec
@@ -5,13 +5,15 @@
 #   tests fail.
 %bcond_with	tests	# Enable tests, see TODO
 
+%{?use_default_jdk:%use_default_jdk 8}
+
 
 %define		srcname	xmlgraphics-commons
 Summary:	Apache XML Graphics Commons
 Summary(pl.UTF-8):	Apache XML Graphics Commons - wspólne komponenty graficzne
 Name:		java-xmlgraphics-commons
 Version:	1.4
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Libraries/Java
 # http://svn.apache.org/repos/asf/xmlgraphics/commons/branches/commons-1_0/
@@ -23,10 +25,10 @@ BuildRequires:	ant >= 1.6.5
 BuildRequires:	java-commons-io
 BuildRequires:	java-commons-logging
 %{?with_tests:BuildRequires:	java-junit >= 3.8.1}
-BuildRequires:	jdk
+%buildrequires_jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.556
 # disable internal-codecs in build.properities for compatibility with other jre's
 Requires:	java-commons-io
 Requires:	java-commons-logging
@@ -55,11 +57,22 @@ pliki PDF oraz PostScript i wiele więcej.
 
 rm lib/*.jar
 
+# Remove sources that depend on com.sun.image.codec.jpeg (removed in OpenJDK 8);
+# the build.xml internal-codecs.disabled flag intends to skip these but javac
+# source-path resolution still pulls them in as dependencies of other files
+rm -rf src/java/org/apache/xmlgraphics/image/codec/tiff
+rm -f src/java/org/apache/xmlgraphics/image/writer/internal/TIFFImageWriter.java
+rm -f src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRawCCITTFax.java
+rm -f src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawCCITTFax.java
+rm -f src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderTIFF.java
+rm -f src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderInternalTIFF.java
+rm -f src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryInternalTIFF.java
+
 %build
 required_jars="commons-io commons-logging"
 export JAVA_HOME=%{java_home}
 CLASSPATH=$(build-classpath $required_jars)
-%ant -Dbuild.sysclasspath=first -Djunit.present=0 package %{?with_tests:junit}
+%ant -Dbuild.sysclasspath=first -Djunit.present=0 -Dinternal-codecs.disabled=true package %{?with_tests:junit}
 
 %install
 rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-xmlgraphics-commons.git/commitdiff/08e5f6c471f1d6103a74d4e098627c3933139b5e