|
|
|
|
@ -1,10 +1,8 @@
|
|
|
|
|
%bcond_with bootstrap
|
|
|
|
|
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
%bcond_without ivy
|
|
|
|
|
%else
|
|
|
|
|
%bcond_with ivy
|
|
|
|
|
|
|
|
|
|
# Don't generate requires on jpackage-utils and java-headless for
|
|
|
|
|
# provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole.
|
|
|
|
|
%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}/maven-metadata/javapackages-metadata.xml$
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%global python_prefix python3
|
|
|
|
|
%global python_interpreter %{?__python3}%{!?__python3:dummy}
|
|
|
|
|
@ -12,9 +10,11 @@
|
|
|
|
|
%global default_jdk %{_prefix}/lib/jvm/java-17-openjdk
|
|
|
|
|
%global default_jre %{_prefix}/lib/jvm/jre-17-openjdk
|
|
|
|
|
|
|
|
|
|
%global maven_home %{_datadir}/xmvn
|
|
|
|
|
|
|
|
|
|
Name: javapackages-tools
|
|
|
|
|
Version: 6.0.0
|
|
|
|
|
Release: 7%{?dist}
|
|
|
|
|
Version: 6.1.0
|
|
|
|
|
Release: 5%{?dist}
|
|
|
|
|
Summary: Macros and scripts for Java packaging support
|
|
|
|
|
License: BSD
|
|
|
|
|
URL: https://github.com/fedora-java/javapackages
|
|
|
|
|
@ -27,18 +27,16 @@ Source8: toolchains-openjdk8.xml
|
|
|
|
|
Source11: toolchains-openjdk11.xml
|
|
|
|
|
Source17: toolchains-openjdk17.xml
|
|
|
|
|
|
|
|
|
|
Patch1: 0001-Do-not-set-JAVA_HOME-for-ant.patch
|
|
|
|
|
|
|
|
|
|
BuildRequires: coreutils
|
|
|
|
|
BuildRequires: which
|
|
|
|
|
BuildRequires: make
|
|
|
|
|
BuildRequires: asciidoc
|
|
|
|
|
BuildRequires: xmlto
|
|
|
|
|
BuildRequires: lua
|
|
|
|
|
BuildRequires: %{python_prefix}-devel
|
|
|
|
|
BuildRequires: %{python_prefix}-lxml
|
|
|
|
|
BuildRequires: %{python_prefix}-setuptools
|
|
|
|
|
%if !0%{?rhel}
|
|
|
|
|
BuildRequires: %{python_prefix}-pytest
|
|
|
|
|
BuildRequires: %{python_prefix}-pytest-cov
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
Requires: javapackages-filesystem = %{version}-%{release}
|
|
|
|
|
Requires: coreutils
|
|
|
|
|
@ -48,10 +46,6 @@ Requires: which
|
|
|
|
|
Requires: java-17-openjdk-headless
|
|
|
|
|
|
|
|
|
|
Provides: jpackage-utils = %{version}-%{release}
|
|
|
|
|
# These could be generated automatically, but then we would need to
|
|
|
|
|
# depend on javapackages-local for dependency generator.
|
|
|
|
|
Provides: mvn(com.sun:tools) = SYSTEM
|
|
|
|
|
Provides: mvn(sun.jdk:jconsole) = SYSTEM
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
This package provides macros and scripts to support Java packaging.
|
|
|
|
|
@ -68,10 +62,7 @@ install their content.
|
|
|
|
|
Summary: Macros and scripts for Maven packaging support
|
|
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
Requires: javapackages-local = %{version}-%{release}
|
|
|
|
|
%if %{without bootstrap}
|
|
|
|
|
Requires: %{_bindir}/xmvn
|
|
|
|
|
# NOTE keep using Java 11 for the whole lifecycle
|
|
|
|
|
Requires: maven-openjdk11
|
|
|
|
|
Requires: xmvn-minimal
|
|
|
|
|
Requires: mvn(org.fedoraproject.xmvn:xmvn-mojo)
|
|
|
|
|
# Common Maven plugins required by almost every build. It wouldn't make
|
|
|
|
|
# sense to explicitly require them in every package built with Maven.
|
|
|
|
|
@ -79,7 +70,6 @@ Requires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
|
|
|
|
|
Requires: mvn(org.apache.maven.plugins:maven-jar-plugin)
|
|
|
|
|
Requires: mvn(org.apache.maven.plugins:maven-resources-plugin)
|
|
|
|
|
Requires: mvn(org.apache.maven.plugins:maven-surefire-plugin)
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%description -n maven-local
|
|
|
|
|
This package provides macros and scripts to support packaging Maven artifacts.
|
|
|
|
|
@ -107,18 +97,10 @@ packaging in Linux distributions
|
|
|
|
|
|
|
|
|
|
%package -n javapackages-local
|
|
|
|
|
Summary: Non-essential macros and scripts for Java packaging support
|
|
|
|
|
Requires: javapackages-generators = %{version}-%{release}
|
|
|
|
|
%if %{with bootstrap}
|
|
|
|
|
Requires: javapackages-bootstrap
|
|
|
|
|
%else
|
|
|
|
|
Requires: %{_bindir}/xmvn-install
|
|
|
|
|
Requires: %{_bindir}/xmvn-subst
|
|
|
|
|
Requires: %{_bindir}/xmvn-resolve
|
|
|
|
|
Requires: javapackages-common = %{version}-%{release}
|
|
|
|
|
# Java build systems don't have hard requirement on java-devel, so it should be there
|
|
|
|
|
# NOTE keep using Java 11 for the whole lifecycle
|
|
|
|
|
Requires: java-11-openjdk-devel
|
|
|
|
|
Requires: (ant-openjdk11 if ant)
|
|
|
|
|
%endif
|
|
|
|
|
Requires: java-17-openjdk-devel
|
|
|
|
|
Requires: xmvn-tools
|
|
|
|
|
|
|
|
|
|
%description -n javapackages-local
|
|
|
|
|
This package provides non-essential macros and scripts to support Java packaging.
|
|
|
|
|
@ -132,6 +114,23 @@ Requires: %{python_interpreter}
|
|
|
|
|
%description -n javapackages-generators
|
|
|
|
|
RPM dependency generators to support Java packaging.
|
|
|
|
|
|
|
|
|
|
%package -n javapackages-common
|
|
|
|
|
Summary: Non-essential macros and scripts for Java packaging support
|
|
|
|
|
Requires: javapackages-generators = %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description -n javapackages-common
|
|
|
|
|
This package provides non-essential, but commonly used macros and
|
|
|
|
|
scripts to support Java packaging.
|
|
|
|
|
|
|
|
|
|
%package -n javapackages-extra
|
|
|
|
|
Summary: Rarely-used macros and scripts for Java packaging support
|
|
|
|
|
Requires: javapackages-generators = %{version}-%{release}
|
|
|
|
|
Requires: lua
|
|
|
|
|
|
|
|
|
|
%description -n javapackages-extra
|
|
|
|
|
This package provides rarely-used and obsolete macros and scripts to
|
|
|
|
|
support Java packaging.
|
|
|
|
|
|
|
|
|
|
%package -n maven-local-openjdk8
|
|
|
|
|
Summary: OpenJDK 8 toolchain for XMvn
|
|
|
|
|
RemovePathPostfixes: -openjdk8
|
|
|
|
|
@ -160,10 +159,9 @@ Requires: java-17-openjdk-devel
|
|
|
|
|
OpenJDK 17 toolchain for XMvn
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%autosetup -p1 -n javapackages-%{version}
|
|
|
|
|
%setup -q -n javapackages-%{version}
|
|
|
|
|
|
|
|
|
|
sed -i '/^manpage /d' build
|
|
|
|
|
sed -i '/${mandir}/d' install
|
|
|
|
|
sed -i /javapackages-metadata.xml/d install
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%configure --pyinterpreter=%{python_interpreter} \
|
|
|
|
|
@ -184,17 +182,15 @@ rm -rf %{buildroot}%{_sysconfdir}/ivy
|
|
|
|
|
rm -rf %{buildroot}%{_sysconfdir}/ant.d
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
|
|
|
|
|
cp -p %{SOURCE8} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk8
|
|
|
|
|
cp -p %{SOURCE11} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk11
|
|
|
|
|
cp -p %{SOURCE17} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml-openjdk17
|
|
|
|
|
mkdir -p %{buildroot}%{maven_home}/conf/
|
|
|
|
|
cp -p %{SOURCE8} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk8
|
|
|
|
|
cp -p %{SOURCE11} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk11
|
|
|
|
|
cp -p %{SOURCE17} %{buildroot}%{maven_home}/conf/toolchains.xml-openjdk17
|
|
|
|
|
|
|
|
|
|
install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
|
|
|
|
|
|
|
|
|
|
%if !0%{?rhel}
|
|
|
|
|
%check
|
|
|
|
|
#./check
|
|
|
|
|
%endif
|
|
|
|
|
./check
|
|
|
|
|
|
|
|
|
|
%files -f files-tools
|
|
|
|
|
|
|
|
|
|
@ -202,7 +198,11 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
|
|
|
|
|
|
|
|
|
|
%files -n javapackages-generators -f files-generators
|
|
|
|
|
|
|
|
|
|
%files -n javapackages-local -f files-local
|
|
|
|
|
%files -n javapackages-common -f files-common
|
|
|
|
|
|
|
|
|
|
%files -n javapackages-extra -f files-extra
|
|
|
|
|
|
|
|
|
|
%files -n javapackages-local
|
|
|
|
|
|
|
|
|
|
%files -n maven-local
|
|
|
|
|
|
|
|
|
|
@ -211,55 +211,76 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%files -n maven-local-openjdk8
|
|
|
|
|
%dir %{_datadir}/xmvn/conf
|
|
|
|
|
%{_datadir}/xmvn/conf/toolchains.xml-openjdk8
|
|
|
|
|
%dir %{maven_home}/conf
|
|
|
|
|
%{maven_home}/conf/toolchains.xml-openjdk8
|
|
|
|
|
|
|
|
|
|
%files -n maven-local-openjdk11
|
|
|
|
|
%dir %{_datadir}/xmvn/conf
|
|
|
|
|
%{_datadir}/xmvn/conf/toolchains.xml-openjdk11
|
|
|
|
|
%dir %{maven_home}/conf
|
|
|
|
|
%{maven_home}/conf/toolchains.xml-openjdk11
|
|
|
|
|
|
|
|
|
|
%files -n maven-local-openjdk17
|
|
|
|
|
%dir %{_datadir}/xmvn/conf
|
|
|
|
|
%{_datadir}/xmvn/conf/toolchains.xml-openjdk17
|
|
|
|
|
%dir %{maven_home}/conf
|
|
|
|
|
%{maven_home}/conf/toolchains.xml-openjdk17
|
|
|
|
|
|
|
|
|
|
%files -n %{python_prefix}-javapackages -f files-python
|
|
|
|
|
%license LICENSE
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Mon Nov 18 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-7
|
|
|
|
|
- Use Java 11 build tool bindings for package builds
|
|
|
|
|
* Tue Jan 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-5
|
|
|
|
|
- Add generated Requires on multiple versions of java-headless
|
|
|
|
|
- Resolves: rhbz#2165589
|
|
|
|
|
|
|
|
|
|
* Mon Nov 04 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-6
|
|
|
|
|
- Drop generated Requires on various Java versions
|
|
|
|
|
- Related: RHEL-62409
|
|
|
|
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.0-4
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5
|
|
|
|
|
- Include java-21-headless in generated auto-requires
|
|
|
|
|
- Related: RHEL-62409
|
|
|
|
|
* Mon Jul 18 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-3
|
|
|
|
|
- Drop ExclusiveArch
|
|
|
|
|
|
|
|
|
|
* Mon Oct 21 2024 Marián Konček <mkoncek@redhat.com> - 6.0.0-5
|
|
|
|
|
- Make OpenJDK 17 the default JRE/JDK
|
|
|
|
|
- Related: RHEL-62403
|
|
|
|
|
* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 6.1.0-2
|
|
|
|
|
- Rebuilt for Drop i686 JDKs
|
|
|
|
|
|
|
|
|
|
* Wed Jan 25 2023 Marián Konček <mkoncek@redhat.com> - 6.0.0-4
|
|
|
|
|
- Add generated Requires on multiple versions of java-headless
|
|
|
|
|
- Related: rhbz#2164437
|
|
|
|
|
* Thu Jun 23 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.1.0-1
|
|
|
|
|
- Update to upstream version 6.1.0
|
|
|
|
|
|
|
|
|
|
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-3
|
|
|
|
|
- Implement OpenJDK 11 and 17 toolchains
|
|
|
|
|
* Tue Jun 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-10
|
|
|
|
|
- Introduce javapackages-extra and javapackages-common subpackages
|
|
|
|
|
- Drop metadata for com.sun:tools and sun.jdk:jconsole
|
|
|
|
|
- Re-enable tests
|
|
|
|
|
- Re-add manpages
|
|
|
|
|
- Drop bootstrap mode
|
|
|
|
|
|
|
|
|
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6.0.0-2
|
|
|
|
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
|
|
|
Related: rhbz#1991688
|
|
|
|
|
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 6.0.0-9
|
|
|
|
|
- Rebuilt for Python 3.11
|
|
|
|
|
|
|
|
|
|
* Thu May 05 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-8
|
|
|
|
|
- Install toolchains.xml in correct location in bootstrap mode
|
|
|
|
|
|
|
|
|
|
* Thu Jan 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-7
|
|
|
|
|
- Switch to OpenJDK 17 as default JDK/JRE
|
|
|
|
|
|
|
|
|
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Jan 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-5
|
|
|
|
|
- Bootstrap build for Maven 3.8.4
|
|
|
|
|
|
|
|
|
|
* Sun Nov 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-4
|
|
|
|
|
- Uptate ivy-local classpath
|
|
|
|
|
|
|
|
|
|
* Wed Nov 17 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 6.0.0-3
|
|
|
|
|
- Re-add ivy-local subpackage
|
|
|
|
|
|
|
|
|
|
* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-2
|
|
|
|
|
- Implement OpenJDK 11 and 17 toolchains
|
|
|
|
|
|
|
|
|
|
* Mon Jul 26 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-1
|
|
|
|
|
- Update to upstream version 6.0.0
|
|
|
|
|
|
|
|
|
|
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-9
|
|
|
|
|
- Rebuild to workaround DistroBaker issue
|
|
|
|
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0~alpha-9
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-8
|
|
|
|
|
- Bootstrap Maven for CentOS Stream 9
|
|
|
|
|
* Wed Jul 14 2021 Sérgio Basto <sergio@serjux.com> - 6.0.0~alpha-8
|
|
|
|
|
- Drop apache-ivy is orphan now
|
|
|
|
|
|
|
|
|
|
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 6.0.0~alpha-7
|
|
|
|
|
- Rebuilt for Python 3.10
|
