Accepting request 693096 from Java:packages

- Remove reference to the parent pom since we are not building
  using Maven.
- Make tests conditional and switched off by default

OBS-URL: https://build.opensuse.org/request/show/693096
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jansi?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-04-11 10:19:26 +00:00 committed by Git OBS Bridge
commit 535d70a0f8
2 changed files with 19 additions and 6 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 9 15:44:56 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- 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 <jengelh@inai.de> Thu Feb 7 10:39:14 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -16,6 +16,7 @@
# #
%bcond_with tests
Name: jansi Name: jansi
Version: 1.17.1 Version: 1.17.1
Release: 0 Release: 0
@ -26,16 +27,15 @@ URL: http://fusesource.github.io/jansi/
Source0: https://github.com/fusesource/jansi/archive/jansi-project-%{version}.tar.gz Source0: https://github.com/fusesource/jansi/archive/jansi-project-%{version}.tar.gz
Source1: %{name}-build.xml Source1: %{name}-build.xml
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: hawtjni-runtime BuildRequires: hawtjni-runtime
BuildRequires: jansi-native BuildRequires: jansi-native
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: junit %if %{with tests}
BuildRequires: mvn(org.fusesource:fusesource-pom:pom:) BuildRequires: ant-junit
%endif
Requires: mvn(org.fusesource.hawtjni:hawtjni-runtime) Requires: mvn(org.fusesource.hawtjni:hawtjni-runtime)
Requires: mvn(org.fusesource.jansi:jansi-native) Requires: mvn(org.fusesource.jansi:jansi-native)
Requires: mvn(org.fusesource:fusesource-pom:pom:)
BuildArch: noarch BuildArch: noarch
%description %description
@ -75,11 +75,17 @@ pushd jansi
%pom_remove_dep :jansi-linux64 %pom_remove_dep :jansi-linux64
popd popd
%pom_remove_parent .
%build %build
mkdir -p jansi/lib mkdir -p jansi/lib
build-jar-repository -s jansi/lib \ build-jar-repository -s jansi/lib \
hawtjni/hawtjni-runtime jansi-native/jansi-native junit hamcrest/core hawtjni/hawtjni-runtime jansi-native/jansi-native
%{ant} -f %{name}-build.xml jar javadoc %{ant} -f %{name}-build.xml \
%if %{without tests}
-Dtest.skip=true \
%endif
jar javadoc
%install %install
# jar # jar