Compare commits

...

No commits in common. "imports/c8s-stream-rhel8/batik-1.14-2.module+el8.5.0+12379+7bd5b6bb" and "c8" have entirely different histories.

3 changed files with 24 additions and 50 deletions

View File

@ -1 +1 @@
ac13b18fc0e4a0b37d2abe1d32e3a3dbe3a2a968 SOURCES/batik-src-1.14.zip
eb681b6fe0c7d08fc9a6f37e15a5a6554efdfb5e SOURCES/batik-src-1.11.zip

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/batik-src-1.14.zip
SOURCES/batik-src-1.11.zip

View File

@ -1,8 +1,11 @@
%global classpath batik:xml-commons-apis:xml-commons-apis-ext:xmlgraphics-commons
# Allow conditionally building without deps on scripting libs rhino and jython
%bcond_with jp_minimal
%global classpath batik:rhino:xml-commons-apis:xml-commons-apis-ext:xmlgraphics-commons:jai_imageio
Name: batik
Version: 1.14
Release: 2%{?dist}
Version: 1.11
Release: 1%{?dist}
Summary: Scalable Vector Graphics for Java
License: ASL 2.0 and W3C
URL: https://xmlgraphics.apache.org/batik/
@ -15,14 +18,21 @@ BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache:apache:pom:)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildRequires: mvn(org.apache.xmlgraphics:xmlgraphics-commons)
BuildRequires: mvn(org.apache.xmlgraphics:xmlgraphics-commons) >= 2.3
%if %{without jp_minimal}
BuildRequires: mvn(org.mozilla:rhino)
BuildRequires: mvn(org.python:jython)
%endif
BuildRequires: mvn(xalan:xalan)
BuildRequires: mvn(xml-apis:xml-apis)
BuildRequires: mvn(xml-apis:xml-apis-ext)
# full support for tiff
Recommends: jai-imageio-core
%description
Batik is a Java(tm) technology based toolkit for applications that want
to use images in the Scalable Vector Graphics (SVG) format for various
@ -30,6 +40,7 @@ purposes, such as viewing, generation or manipulation.
%package util
Summary: Batik utility library
Obsoletes: %{name} < 1.11-1
%description util
Util component of the Apache Batik SVG manipulation and rendering library.
@ -44,9 +55,7 @@ CSS component of the Apache Batik SVG manipulation and rendering library.
Summary: Batik SVG browser
# Explicit requires for javapackages-tools since squiggle-script
# uses /usr/share/java-utils/java-functions
Requires: javapackages-tools
# Requires AWT, so can't rely on java-headless alone
Requires: java
Requires: javapackages-tools
%description squiggle
The Squiggle SVG Browser lets you view SVG file, zoom, pan and rotate
@ -93,8 +102,6 @@ Summary: Batik SVG slideshow
# Explicit requires for javapackages-tools since slideshow-script
# uses /usr/share/java-utils/java-functions
Requires: javapackages-tools
# Requires AWT, so can't rely on java-headless alone
Requires: java
%description slideshow
Batik SVG slideshow.
@ -140,10 +147,8 @@ for pom in `find -mindepth 2 -name pom.xml -not -path ./batik-all/pom.xml`; do
%pom_xpath_inject pom:project '<packaging>bundle</packaging>' $pom
done
# The "old-test" module cannot be built due to missing deps in Fedora
%pom_disable_module batik-test-old
# Remove optional deps on rhino and jython
%if %{with jp_minimal}
# Remove optional deps on rhino and jython for minimal build
%pom_remove_dep :rhino batik-{bridge,script}
%pom_remove_dep :jython batik-script
rm -rf batik-script/src/main/java/org/apache/batik/script/{jpython,rhino}
@ -154,6 +159,7 @@ rm batik-bridge/src/main/java/org/apache/batik/bridge/RhinoInterpreterFactory.ja
rm batik-bridge/src/main/java/org/apache/batik/bridge/EventTargetWrapper.java
rm batik-bridge/src/main/java/org/apache/batik/bridge/GlobalWrapper.java
rm batik-bridge/src/main/java/org/apache/batik/bridge/WindowWrapper.java
%endif
%mvn_package :batik-squiggle squiggle
%mvn_package :batik-squiggle-ext squiggle
@ -164,26 +170,22 @@ rm batik-bridge/src/main/java/org/apache/batik/bridge/WindowWrapper.java
%mvn_package :batik-slideshow slideshow
%mvn_package :batik-css css
%mvn_package :batik-constants util
%mvn_package :batik-shared-resources util
%mvn_package :batik-i18n util
%mvn_package :batik-util util
%mvn_package ':batik-test*' __noinstall
%mvn_file :batik-all batik-all
#no jacl rpm and it breaks javadoc
rm batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreter.java
%build
%mvn_build
%install
%mvn_install
%jpackage_script org.apache.batik.apps.svgbrowser.Main '' '' %{classpath}:rhino squiggle true
%jpackage_script org.apache.batik.apps.svgbrowser.Main '' '' %{classpath} squiggle true
%jpackage_script org.apache.batik.apps.svgpp.Main '' '' %{classpath} svgpp true
%jpackage_script org.apache.batik.apps.ttf2svg.Main '' '' %{classpath} ttf2svg true
%jpackage_script org.apache.batik.apps.rasterizer.Main '' '' %{classpath}:rhino rasterizer true
%jpackage_script org.apache.batik.apps.rasterizer.Main '' '' %{classpath} rasterizer true
%jpackage_script org.apache.batik.apps.slideshow.Main '' '' %{classpath} slideshow true
# Demo
@ -221,34 +223,6 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%changelog
* Tue Mar 09 2021 Aleksandar Kurtakov <akurtako@redhat.com> - 1.14-2
- Enforce minimal build as jython is orphaned
* Mon Mar 01 2021 Jie Kang <jkang@redhat.com> - 1.14-1
- Update to latest upstream release
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Aug 18 2020 Mat Booth <mat.booth@redhat.com> - 1.13-1
- Update to latest upstream release
- Add requirements on full JRE for subpackages that require AWT
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.11-6
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Mon Jun 15 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-4
- build with --xmvn-javadoc
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed May 15 2019 Mat Booth <mat.booth@redhat.com> - 1.11-1
- Update to latest upstream release
- Drop ancient obsoletes