4 changed files with 49 additions and 168 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,5 @@
-/xmlgraphics-commons-*-src.tar.gz
-/*.src.rpm
+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
--- a/jdk25.patch
+++ b/jdk25.patch
@ -1,12 +0,0 @@
--- 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());
-                 }
-             }
-
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xmlgraphics-commons-2.11-src.tar.gz) = 2249a1ca0ee26522d0a8f34af96791611dfe849278ad98b2f5a571fde662a8eef7f2594f6929f2414f57e0bcd286ed14192471556fb29c9355cb046e9c806e0c
+d8b3b07116e5387c760f4fe6dbe598c0  xmlgraphics-commons-2.0.1-src.tar.gz
--- a/xmlgraphics-commons.spec
+++ b/xmlgraphics-commons.spec
@ -1,24 +1,24 @@
 Name:           xmlgraphics-commons
-Version:        2.11
-Release:        7%{?dist}
+Version:        2.0.1
+Release:        2%{?dist}
 Epoch:          0
 Summary:        XML Graphics Commons

-License:        Apache-2.0 
+License:        ASL 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
+Source0:        http://apache.org/dist/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz

 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
-
-BuildRequires:  maven-local-openjdk25
-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)
+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
+Requires:       java
+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
@ -29,158 +29,48 @@ 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}
+%package        javadoc
+Summary:        Javadoc for %{name}
+
+%description    javadoc
+%{summary}.

-%description javadoc
-This package contains API documentation for %{name}.

 %prep
 %setup -q %{name}-%{version}
-patch -p1 < %{PATCH1}
-find -name "*.jar" -delete
+rm -f `find . -name "*.jar"`

-# Disable plugins not needed for RPM build
-%pom_remove_plugin :maven-checkstyle-plugin
+# create pom from template
+sed "s:@version@:%{version}:g" %{name}-pom-template.pom \
+    > %{name}.pom

-# 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
-%mvn_file : %{name}
-%mvn_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

 %install
-%mvn_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
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}

 %files -f .mfiles
-%license LICENSE NOTICE
-%doc README
+%doc LICENSE NOTICE README
+
+%files javadoc
+%doc LICENSE NOTICE
+%doc %{_javadocdir}/%{name}

-%files javadoc -f .mfiles-javadoc
-%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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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