Sync with MBI
Related: rhbz#1951482
This commit is contained in:
parent
c35df14563
commit
39ee8ddb44
2
.gitignore
vendored
2
.gitignore
vendored
@ -73,3 +73,5 @@
|
|||||||
/5.1.0.tar.gz
|
/5.1.0.tar.gz
|
||||||
/5.2.0.tar.gz
|
/5.2.0.tar.gz
|
||||||
/5.3.0.tar.gz
|
/5.3.0.tar.gz
|
||||||
|
/5.3.1.tar.gz
|
||||||
|
/6.0.0~alpha.tar.gz
|
||||||
|
19
javapackages-config.json
Normal file
19
javapackages-config.json
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
"maven.req": {
|
||||||
|
"always_generate": [
|
||||||
|
"javapackages-filesystem",
|
||||||
|
"(java-headless or java-11-headless)"
|
||||||
|
],
|
||||||
|
"java_requires": {
|
||||||
|
"skip": true
|
||||||
|
},
|
||||||
|
"java_devel_requires": {
|
||||||
|
"skip": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"javadoc.req": {
|
||||||
|
"always_generate": [
|
||||||
|
"javapackages-filesystem"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
@ -2,55 +2,37 @@
|
|||||||
# provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole.
|
# 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$
|
%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}/maven-metadata/javapackages-metadata.xml$
|
||||||
|
|
||||||
# Disable automatic bytecode compilation for files in java-utils
|
|
||||||
# https://fedoraproject.org/wiki/Packaging:Python_Appendix#Manual_byte_compilation
|
|
||||||
%global _python_bytecompile_extra 0
|
|
||||||
|
|
||||||
%bcond_without asciidoc
|
|
||||||
%bcond_with gradle
|
|
||||||
%bcond_without tests
|
|
||||||
%bcond_without xmvn_javadoc
|
|
||||||
|
|
||||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
|
||||||
%global python_prefix python3
|
%global python_prefix python3
|
||||||
%global python_interpreter %{?__python3}%{!?__python3:dummy}
|
%global python_interpreter %{?__python3}%{!?__python3:dummy}
|
||||||
%else
|
%global python_sitelib %{python3_sitelib}
|
||||||
%global python_prefix python
|
|
||||||
%global python_interpreter %{?__python2}%{!?__python2:dummy}
|
|
||||||
%global rpmmacrodir /etc/rpm
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-11-openjdk
|
%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-11-openjdk
|
||||||
%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-11-openjdk
|
%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-11-openjdk
|
||||||
|
|
||||||
Name: javapackages-tools
|
Name: javapackages-tools
|
||||||
Version: 5.3.0
|
Version: 6.0.0~alpha
|
||||||
Release: 16%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Summary: Macros and scripts for Java packaging support
|
Summary: Macros and scripts for Java packaging support
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://github.com/fedora-java/javapackages
|
URL: https://github.com/fedora-java/javapackages
|
||||||
Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
|
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
# git archive --prefix javapackages-6.0.0~alpha/ HEAD | gzip -9nc >6.0.0~alpha.tar.gz
|
||||||
|
Source0: %{version}.tar.gz
|
||||||
|
#Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
|
||||||
|
Source2: toolchains-openjdk8.xml
|
||||||
|
Source3: javapackages-config.json
|
||||||
|
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: which
|
BuildRequires: which
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
%if %{with asciidoc}
|
|
||||||
BuildRequires: asciidoc
|
|
||||||
BuildRequires: xmlto
|
|
||||||
%endif
|
|
||||||
BuildRequires: %{python_prefix}-devel
|
BuildRequires: %{python_prefix}-devel
|
||||||
BuildRequires: %{python_prefix}-lxml
|
BuildRequires: %{python_prefix}-lxml
|
||||||
BuildRequires: %{python_prefix}-setuptools
|
BuildRequires: %{python_prefix}-setuptools
|
||||||
%if !0%{?_module_build}
|
%if !0%{?rhel}
|
||||||
# XXX python-nose is not part of any module yet, but it should get
|
BuildRequires: %{python_prefix}-pytest
|
||||||
# modularized one day, right? mizdebsk, Sep 2017
|
BuildRequires: %{python_prefix}-pytest-cov
|
||||||
BuildRequires: %{python_prefix}-nose
|
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: %{python_prefix}-six
|
|
||||||
|
|
||||||
Requires: javapackages-filesystem = %{version}-%{release}
|
Requires: javapackages-filesystem = %{version}-%{release}
|
||||||
Requires: coreutils
|
Requires: coreutils
|
||||||
@ -70,7 +52,6 @@ This package provides macros and scripts to support Java packaging.
|
|||||||
|
|
||||||
%package -n javapackages-filesystem
|
%package -n javapackages-filesystem
|
||||||
Summary: Java packages filesystem layout
|
Summary: Java packages filesystem layout
|
||||||
Obsoletes: eclipse-filesystem < 2
|
|
||||||
Provides: eclipse-filesystem = %{version}-%{release}
|
Provides: eclipse-filesystem = %{version}-%{release}
|
||||||
|
|
||||||
%description -n javapackages-filesystem
|
%description -n javapackages-filesystem
|
||||||
@ -81,29 +62,18 @@ install their content.
|
|||||||
Summary: Macros and scripts for Maven packaging support
|
Summary: Macros and scripts for Maven packaging support
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: javapackages-local = %{version}-%{release}
|
Requires: javapackages-local = %{version}-%{release}
|
||||||
Requires: xmvn-minimal
|
Requires: (%{_bindir}/xmvn or javapackages-bootstrap)
|
||||||
Requires: xmvn-mojo
|
Requires: (mvn(org.fedoraproject.xmvn:xmvn-mojo) or javapackages-bootstrap)
|
||||||
Requires: xmvn-connector-aether
|
|
||||||
# Common Maven plugins required by almost every build. It wouldn't make
|
# Common Maven plugins required by almost every build. It wouldn't make
|
||||||
# sense to explicitly require them in every package built with Maven.
|
# sense to explicitly require them in every package built with Maven.
|
||||||
Requires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
|
Requires: (mvn(org.apache.maven.plugins:maven-compiler-plugin) or javapackages-bootstrap)
|
||||||
Requires: mvn(org.apache.maven.plugins:maven-jar-plugin)
|
Requires: (mvn(org.apache.maven.plugins:maven-jar-plugin) or javapackages-bootstrap)
|
||||||
%if %{without xmvn_javadoc}
|
Requires: (mvn(org.apache.maven.plugins:maven-resources-plugin) or javapackages-bootstrap)
|
||||||
Requires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)
|
Requires: (mvn(org.apache.maven.plugins:maven-surefire-plugin) or javapackages-bootstrap)
|
||||||
%endif
|
|
||||||
Requires: mvn(org.apache.maven.plugins:maven-resources-plugin)
|
|
||||||
Requires: mvn(org.apache.maven.plugins:maven-surefire-plugin)
|
|
||||||
# Tests based on JUnit are very common and JUnit itself is small.
|
|
||||||
# Include JUnit and JUnit provider for Surefire just for convenience.
|
|
||||||
Requires: mvn(junit:junit)
|
|
||||||
Requires: mvn(org.apache.maven.surefire:surefire-junit4)
|
|
||||||
# testng is quite common as well
|
|
||||||
Requires: mvn(org.apache.maven.surefire:surefire-testng)
|
|
||||||
|
|
||||||
%description -n maven-local
|
%description -n maven-local
|
||||||
This package provides macros and scripts to support packaging Maven artifacts.
|
This package provides macros and scripts to support packaging Maven artifacts.
|
||||||
|
|
||||||
%if %{with gradle}
|
|
||||||
%package -n gradle-local
|
%package -n gradle-local
|
||||||
Summary: Local mode for Gradle
|
Summary: Local mode for Gradle
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
@ -114,7 +84,6 @@ Requires: xmvn-connector-gradle
|
|||||||
%description -n gradle-local
|
%description -n gradle-local
|
||||||
This package implements local mode for Gradle, which allows artifact
|
This package implements local mode for Gradle, which allows artifact
|
||||||
resolution using XMvn resolver.
|
resolution using XMvn resolver.
|
||||||
%endif
|
|
||||||
|
|
||||||
%package -n ivy-local
|
%package -n ivy-local
|
||||||
Summary: Local mode for Apache Ivy
|
Summary: Local mode for Apache Ivy
|
||||||
@ -130,8 +99,6 @@ artifact resolution using XMvn resolver.
|
|||||||
%package -n %{python_prefix}-javapackages
|
%package -n %{python_prefix}-javapackages
|
||||||
Summary: Module for handling various files for Java packaging
|
Summary: Module for handling various files for Java packaging
|
||||||
Requires: %{python_prefix}-lxml
|
Requires: %{python_prefix}-lxml
|
||||||
Requires: %{python_prefix}-six
|
|
||||||
Obsoletes: python-javapackages < %{version}-%{release}
|
|
||||||
|
|
||||||
%description -n %{python_prefix}-javapackages
|
%description -n %{python_prefix}-javapackages
|
||||||
Module for handling, querying and manipulating of various files for Java
|
Module for handling, querying and manipulating of various files for Java
|
||||||
@ -139,26 +106,38 @@ packaging in Linux distributions
|
|||||||
|
|
||||||
%package -n javapackages-local
|
%package -n javapackages-local
|
||||||
Summary: Non-essential macros and scripts for Java packaging support
|
Summary: Non-essential macros and scripts for Java packaging support
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: javapackages-generators = %{version}-%{release}
|
||||||
Requires: xmvn-install
|
Requires: (%{_bindir}/xmvn-install or javapackages-bootstrap)
|
||||||
Requires: xmvn-subst
|
Requires: (%{_bindir}/xmvn-subst or javapackages-bootstrap)
|
||||||
Requires: xmvn-resolve
|
Requires: (%{_bindir}/xmvn-resolve or javapackages-bootstrap)
|
||||||
# Java build systems don't have hard requirement on java-devel, so it should be there
|
# Java build systems don't have hard requirement on java-devel, so it should be there
|
||||||
Requires: java-11-openjdk-devel
|
Requires: java-11-openjdk-devel
|
||||||
Requires: %{python_prefix}-javapackages = %{version}-%{release}
|
|
||||||
Requires: %{python_interpreter}
|
|
||||||
Provides: javapackages-generators
|
|
||||||
|
|
||||||
%description -n javapackages-local
|
%description -n javapackages-local
|
||||||
This package provides non-essential macros and scripts to support Java packaging.
|
This package provides non-essential macros and scripts to support Java packaging.
|
||||||
|
|
||||||
|
%package -n javapackages-generators
|
||||||
|
Summary: RPM dependency generators for Java packaging support
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Requires: %{python_prefix}-javapackages = %{version}-%{release}
|
||||||
|
Requires: %{python_interpreter}
|
||||||
|
|
||||||
|
%description -n javapackages-generators
|
||||||
|
RPM dependency generators to support Java packaging.
|
||||||
|
|
||||||
|
%package -n maven-local-openjdk8
|
||||||
|
Summary: OpenJDK 8 toolchain for XMvn
|
||||||
|
Requires: maven-local
|
||||||
|
Requires: java-1.8.0-openjdk-devel
|
||||||
|
|
||||||
|
%description -n maven-local-openjdk8
|
||||||
|
OpenJDK 8 toolchain for XMvn
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n javapackages-%{version}
|
%setup -q -n javapackages-%{version}
|
||||||
|
|
||||||
%if %{without asciidoc}
|
|
||||||
sed -i '/^manpage /d' build
|
sed -i '/^manpage /d' build
|
||||||
sed -i '/${mandir}/d' install
|
sed -i '/${mandir}/d' install
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --pyinterpreter=%{python_interpreter} \
|
%configure --pyinterpreter=%{python_interpreter} \
|
||||||
@ -169,80 +148,77 @@ sed -i '/${mandir}/d' install
|
|||||||
%install
|
%install
|
||||||
./install
|
./install
|
||||||
|
|
||||||
%if %{with xmvn_javadoc}
|
|
||||||
sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fjava')
|
|
||||||
%endif
|
|
||||||
sed -e 's/.[17]$/&*/' -i files-*
|
sed -e 's/.[17]$/&*/' -i files-*
|
||||||
|
|
||||||
%if %{without gradle}
|
mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
|
||||||
rm -rf %{buildroot}%{_bindir}/gradle-local
|
cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
|
||||||
rm -rf %{buildroot}%{_datadir}/gradle-local
|
|
||||||
rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with tests}
|
install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config.json
|
||||||
%if !0%{?_module_build}
|
|
||||||
|
%if !0%{?rhel}
|
||||||
%check
|
%check
|
||||||
./check
|
#./check
|
||||||
%endif
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files -f files-tools
|
%files -f files-tools
|
||||||
|
|
||||||
%files -n javapackages-filesystem -f files-filesystem
|
%files -n javapackages-filesystem -f files-filesystem
|
||||||
|
|
||||||
|
%files -n javapackages-generators -f files-generators
|
||||||
|
|
||||||
%files -n javapackages-local -f files-local
|
%files -n javapackages-local -f files-local
|
||||||
|
|
||||||
%files -n maven-local
|
%files -n maven-local
|
||||||
|
|
||||||
%if %{with gradle}
|
|
||||||
%files -n gradle-local -f files-gradle
|
%files -n gradle-local -f files-gradle
|
||||||
%endif
|
|
||||||
|
|
||||||
%files -n ivy-local -f files-ivy
|
%files -n ivy-local -f files-ivy
|
||||||
|
|
||||||
|
%files -n maven-local-openjdk8
|
||||||
|
%{_datadir}/xmvn/conf
|
||||||
|
|
||||||
%files -n %{python_prefix}-javapackages -f files-python
|
%files -n %{python_prefix}-javapackages -f files-python
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.3.0-16
|
* Wed Jul 29 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-1
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
- Update to upstream version 6.0.0~alpha
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-15
|
* Fri Jul 17 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-9
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
- Add separate subpackage with RPM generators
|
||||||
|
|
||||||
* Mon Nov 30 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-14
|
* Thu Jul 16 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-8
|
||||||
- Add javapackages-generators provides
|
- Don't use networking during tests
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-13
|
* Thu Jan 23 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-7
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Add OpenJDK 8 toolchain configuration
|
||||||
|
|
||||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 5.3.0-12
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-6
|
||||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
* Wed Jun 10 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-11
|
* Fri Oct 25 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-5
|
||||||
- Use XMvn Javadoc MOJO for generating API docs
|
|
||||||
|
|
||||||
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 5.3.0-10
|
|
||||||
- Rebuilt for Python 3.9
|
|
||||||
|
|
||||||
* Tue Apr 28 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-10
|
|
||||||
- Switch to OpenJDK 11 as default JDK
|
- Switch to OpenJDK 11 as default JDK
|
||||||
|
|
||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-9
|
* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Enable namespaced dependency generation
|
||||||
|
|
||||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 5.3.0-8
|
* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-3
|
||||||
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
- Don't ignore duplicate metadata in namespaced modules
|
||||||
|
|
||||||
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 5.3.0-7
|
* Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-2
|
||||||
- Rebuilt for Python 3.8
|
- Introduce javapackages-config-maven-3.6
|
||||||
|
|
||||||
* Sun Aug 11 2019 Fabio Valentini <decathorpe@gmail.com> - 5.3.0-6
|
* Fri Jun 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.1-1
|
||||||
- Disable gradle support by default.
|
- Update to upstream version 5.3.1
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-5
|
* Mon Jun 10 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-7
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Define maven-3.6 install repository
|
||||||
|
|
||||||
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-6
|
||||||
|
- Mass rebuild for javapackages-tools 201901
|
||||||
|
|
||||||
|
* Thu Apr 25 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.3.0-5
|
||||||
|
- Move python modules under java-utils directory
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-4
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (5.3.0.tar.gz) = 41b5398cd276cf10c1e3ce1a8283ab9ef19df8a2ad19db20553ff31e31d26af9f14bb566574a3ee534a9af2cf1f1626086bf551b4bc6ed12bc0082c46b6b7e98
|
SHA512 (6.0.0~alpha.tar.gz) = 1af48a06d4c29e004fded8c11c817c840a321710b76f2393020ac9fd48ddbf688539623cb784ab64874d7a5cc1320d757b18b31aa4c6e383dc4260de2e6572e3
|
||||||
|
11
toolchains-openjdk8.xml
Normal file
11
toolchains-openjdk8.xml
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<toolchains>
|
||||||
|
<toolchain>
|
||||||
|
<type>jdk</type>
|
||||||
|
<provides>
|
||||||
|
<xmvn>xmvn</xmvn>
|
||||||
|
</provides>
|
||||||
|
<configuration>
|
||||||
|
<jdkHome>/usr/lib/jvm/java-1.8.0-openjdk</jdkHome>
|
||||||
|
</configuration>
|
||||||
|
</toolchain>
|
||||||
|
</toolchains>
|
Loading…
Reference in New Issue
Block a user