From 5a45693a73601990b15304b1b6f5a79046c0e8d6206c987674836b1d1074ba2d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 9 Apr 2019 15:45:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jansi?expand=0&rev=4 --- jansi.changes | 7 +++++++ jansi.spec | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/jansi.changes b/jansi.changes index 8e4e005..79718c8 100644 --- a/jansi.changes +++ b/jansi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 9 15:44:56 UTC 2019 - Fridrich Strba + +- Remove reference to the parent pom since we are not building + using Maven. +- Make tests conditional and switched off by default + ------------------------------------------------------------------- Thu Feb 7 10:39:14 UTC 2019 - Jan Engelhardt diff --git a/jansi.spec b/jansi.spec index cfb76f2..d10b8f2 100644 --- a/jansi.spec +++ b/jansi.spec @@ -16,6 +16,7 @@ # +%bcond_with tests Name: jansi Version: 1.17.1 Release: 0 @@ -26,16 +27,15 @@ URL: http://fusesource.github.io/jansi/ Source0: https://github.com/fusesource/jansi/archive/jansi-project-%{version}.tar.gz Source1: %{name}-build.xml BuildRequires: ant -BuildRequires: ant-junit BuildRequires: fdupes BuildRequires: hawtjni-runtime BuildRequires: jansi-native BuildRequires: javapackages-local -BuildRequires: junit -BuildRequires: mvn(org.fusesource:fusesource-pom:pom:) +%if %{with tests} +BuildRequires: ant-junit +%endif Requires: mvn(org.fusesource.hawtjni:hawtjni-runtime) Requires: mvn(org.fusesource.jansi:jansi-native) -Requires: mvn(org.fusesource:fusesource-pom:pom:) BuildArch: noarch %description @@ -75,11 +75,17 @@ pushd jansi %pom_remove_dep :jansi-linux64 popd +%pom_remove_parent . + %build mkdir -p jansi/lib build-jar-repository -s jansi/lib \ - hawtjni/hawtjni-runtime jansi-native/jansi-native junit hamcrest/core -%{ant} -f %{name}-build.xml jar javadoc + hawtjni/hawtjni-runtime jansi-native/jansi-native +%{ant} -f %{name}-build.xml \ +%if %{without tests} + -Dtest.skip=true \ +%endif + jar javadoc %install # jar