From 82a420f7c9f9f2b3ee00165e1a40648d66ce7c88 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Jul 03 2017 13:15:46 +0000 Subject: Install with XMvn --- diff --git a/jai-imageio-core.spec b/jai-imageio-core.spec index f2e0262..f9a9132 100644 --- a/jai-imageio-core.spec +++ b/jai-imageio-core.spec @@ -2,10 +2,9 @@ Name: jai-imageio-core Version: 1.2 -Release: 0.19.%{cvs_ver}cvs%{?dist} +Release: 0.20.%{cvs_ver}cvs%{?dist} Summary: Core Java Advanced Imaging Image I/O Tools API -Group: System Environment/Libraries License: BSD URL: https://java.net/projects/jai-imageio-core Source0: jai-imageio-core-cvs%{cvs_ver}-CLEANED.tar.xz @@ -23,9 +22,9 @@ Source1: README-fedora-epel.txt # ./generate-tarball.sh USERNAME DATE Source2: generate-tarball.sh -BuildRequires: java-devel ant jpackage-utils +BuildRequires: javapackages-local +BuildRequires: ant BuildRequires: recode -Requires: java jpackage-utils Patch0: jai-imageio-core-remove-imageio-services.patch @@ -43,7 +42,6 @@ minus JPEG 2000, JAI Image I/O operations, and the C-based codecLib. %package javadoc Summary: Javadocs for %{name} -Group: Documentation Requires: jpackage-utils @@ -81,24 +79,22 @@ ant -DBUILD_TARGET=linux-i586 jar-opt docs-jcp %install -mkdir -p $RPM_BUILD_ROOT%{_javadir} -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%mvn_file : jai_imageio +%mvn_artifact net.java.dev.jai-imageio:jai-imageio-core:%{version} build/linux-i586/opt/lib/ext/jai_imageio.jar -cp -av build/linux-i586/opt/lib/ext/jai_imageio.jar $RPM_BUILD_ROOT%{_javadir}/jai_imageio.jar -%add_maven_depmap net.java.dev.jai-imageio:jai-imageio-core:%{version} jai_imageio.jar - -cp -av build/linux-i586/javadocs/docs-jcp/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} +%mvn_install -J %build/linux-i586/javadocs/docs-jcp %files -f .mfiles %doc LICENSE.txt COPYRIGHT.txt README-fedora-epel.txt -%{_javadir}/*.jar -%files javadoc +%files javadoc -f .mfiles %doc LICENSE.txt COPYRIGHT.txt README-fedora-epel.txt -%{_javadocdir}/%{name} %changelog +* Mon Jul 03 2017 Michael Simacek - 1.2-0.20.20100217cvs +- Install with XMvn + * Fri Feb 10 2017 Fedora Release Engineering - 1.2-0.19.20100217cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild