Merge branch 'javapackages'

This commit is contained in:
Mikolaj Izdebski 2018-07-31 17:18:04 +02:00
commit ad78c4f7ed

View File

@ -38,7 +38,7 @@
Name: ant Name: ant
Version: 1.10.4 Version: 1.10.4
Release: 2%{?dist} Release: 3%{?dist}
Epoch: 0 Epoch: 0
Summary: Java build tool Summary: Java build tool
Summary(it): Tool per la compilazione di programmi java Summary(it): Tool per la compilazione di programmi java
@ -80,6 +80,9 @@ BuildRequires: junit5
%{?fedora:Recommends}%{!?fedora:Requires}: java-devel >= 1:1.8.0 %{?fedora:Recommends}%{!?fedora:Requires}: java-devel >= 1:1.8.0
Requires: %{name}-lib = %{epoch}:%{version}-%{release} Requires: %{name}-lib = %{epoch}:%{version}-%{release}
# Require full javapackages-tools since the ant script uses
# /usr/share/java-utils/java-functions
Requires: javapackages-tools
BuildArch: noarch BuildArch: noarch
@ -626,6 +629,9 @@ LC_ALL=en_US.utf8 %{ant} test
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:1.10.4-3
- Require javapackages-tools for ant script.
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.10.4-2 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.10.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild