From 7bc76c803cb40dde1a6e178e89632a0b390f7c1b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 11 Nov 2015 13:22:17 +0100 Subject: [PATCH] Add bootstrap macro ... and enable bootstrap for Python 3.5 rebuilds. https://fedoraproject.org/wiki/Packaging:Guidelines#Bootstrapping https://bugzilla.redhat.com/show_bug.cgi?id=1280209 --- javapackages-tools.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 3d441ee..0537b53 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -2,11 +2,14 @@ # 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$ +# Avoid circular dependency on itself when bootstrapping +%{!?_with_bootstrap: %global bootstrap 1} + %bcond_without tests Name: javapackages-tools Version: 4.6.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Macros and scripts for Java packaging support @@ -27,8 +30,10 @@ BuildRequires: asciidoc BuildRequires: xmlto BuildRequires: scl-utils-build BuildRequires: dia +%if ! 0%{?bootstrap} BuildRequires: javapackages-tools >= 4.0.0 BuildRequires: xmvn-resolve >= 2 +%endif Requires: coreutils Requires: lua @@ -172,6 +177,10 @@ popd %license LICENSE %changelog +* Wed Nov 11 2015 Kalev Lember - 4.6.0-10 +- Add bootstrap macro (#1280209) +- Enable bootstrap for Python 3.5 rebuilds + * Tue Nov 10 2015 Fedora Release Engineering - 4.6.0-9 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5