Compare commits

...
Sign in to create a new pull request.

38 commits

Author SHA1 Message Date
Fedora Release Engineering
03092b4bdb Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 09:18:25 +00:00
Fedora Release Engineering
72e9f67e87 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:45:36 +00:00
Jiri Vanek
a25361ce60 Migrated to jdk25 2026-01-06 10:34:03 +01:00
Jiri Vanek
c6ac148320 Rrevert to jdk21
during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
your package failed to build. Is preemptively reverted back to versioned jdk21
2025-07-30 14:12:38 +02:00
Jiri Vanek
98aabbc235 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.
2025-07-30 01:32:34 +02:00
Fedora Release Engineering
dc210a2588 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:55:57 +00:00
Gwyn Ciesla
49082124da 2.11 2025-05-06 08:37:54 -05:00
Fedora Release Engineering
dcd864b2ca Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 16:01:02 +00:00
Gwyn Ciesla
0b7caab5a5 2.10 2024-10-09 08:40:03 -05:00
Fedora Release Engineering
4d2815a7b3 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 10:13:21 +00:00
Jiri Vanek
1dbbd60a62 Rebuilt for java-21-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java21
2024-02-27 18:34:35 +01:00
Fedora Release Engineering
54986fe714 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 09:52:34 +00:00
Gwyn Ciesla
0a4121e22a 2.9 2023-08-23 14:00:49 -05:00
Fedora Release Engineering
0416d453f5 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 19:01:41 +00:00
Gwyn Ciesla
01d8c0ae31 migrated to SPDX license 2023-03-02 15:10:31 -06:00
Fedora Release Engineering
53e328aad6 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 07:37:46 +00:00
Gwyn Ciesla
0d291f6ecf 2.8 2022-11-10 10:29:06 -06:00
Fedora Release Engineering
f9adca4528 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 13:17:33 +00:00
Jiri
14f007e09a Rebuilt for Drop i686 JDKs
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
2022-07-08 17:01:42 +02:00
Jiri
f6f86976ca Rebuilt for java-17-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java17
2022-02-06 00:44:59 +01:00
Gwyn Ciesla
020611d46a 2.7 2022-01-24 14:21:20 -06:00
Fedora Release Engineering
33446336ef - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 05:15:38 +00:00
Fedora Release Engineering
5c0ac2eb83 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 21:43:06 +00:00
Jie Kang
a3661164cd Update to 2.6 2021-03-01 14:41:39 -05:00
Fedora Release Engineering
66607829ee - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-28 00:09:41 +00:00
Mat Booth
7cfaf7ee62 Update to latest upstream release 2020-11-01 20:39:47 +00:00
Fedora Release Engineering
15388402d8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 14:50:19 +00:00
Jiri
533b201c47 Rebuilt for JDK-11 2020-07-11 08:50:00 +02:00
Fedora Release Engineering
9303e8ad00 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 04:36:13 +00:00
Fedora Release Engineering
36ebead965 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 04:20:57 +00:00
Mat Booth
047db54f2c Update to latest upstream release 2019-05-15 16:02:45 +01:00
Fedora Release Engineering
4eb074f7b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 12:33:16 +00:00
Fedora Release Engineering
e3064a17de - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 09:23:35 +00:00
Mat Booth
01cd688342 Update to latest release
Switch to maven-based build
Add OSGi metadata
2018-04-26 10:44:27 +01:00
Fedora Release Engineering
17e0cddede - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 21:47:08 +00:00
Michael Simacek
f9b054d772 Install with XMvn 2018-01-16 16:04:18 +01:00
Fedora Release Engineering
3f630ab736 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 22:13:42 +00:00
Fedora Release Engineering
ab4c96f0d2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 17:57:33 +00:00
4 changed files with 168 additions and 49 deletions

7
.gitignore vendored
View file

@ -1,5 +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-*-src.tar.gz
/*.src.rpm

12
jdk25.patch Normal file
View file

@ -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());
}
}

View file

@ -1 +1 @@
d8b3b07116e5387c760f4fe6dbe598c0 xmlgraphics-commons-2.0.1-src.tar.gz
SHA512 (xmlgraphics-commons-2.11-src.tar.gz) = 2249a1ca0ee26522d0a8f34af96791611dfe849278ad98b2f5a571fde662a8eef7f2594f6929f2414f57e0bcd286ed14192471556fb29c9355cb046e9c806e0c

View file

@ -1,24 +1,24 @@
Name: xmlgraphics-commons
Version: 2.0.1
Release: 2%{?dist}
Version: 2.11
Release: 7%{?dist}
Epoch: 0
Summary: XML Graphics Commons
License: ASL 2.0
License: Apache-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
Patch1: jdk25.patch
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
Requires: java
Requires: apache-commons-io >= 1.3.1
Requires: apache-commons-logging >= 1.0.4
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)
%description
Apache XML Graphics Commons is a library that consists of
@ -29,48 +29,158 @@ 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"`
patch -p1 < %{PATCH1}
find -name "*.jar" -delete
# create pom from template
sed "s:@version@:%{version}:g" %{name}-pom-template.pom \
> %{name}.pom
# Disable plugins not needed for RPM build
%pom_remove_plugin :maven-checkstyle-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
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}
%mvn_install
%files -f .mfiles
%doc LICENSE NOTICE README
%files javadoc
%doc LICENSE NOTICE
%doc %{_javadocdir}/%{name}
%license LICENSE NOTICE
%doc README
%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