6
0
forked from pool/openregex
2021-05-11 17:53:10 +00:00
committed by Git OBS Bridge
parent 92b1893559
commit 1dae6582b4
2 changed files with 15 additions and 3 deletions

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 11 17:52:15 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Do not build against the legacy version of guava any more
- Build with Java 8 as baseline, in order to be able to use
guava 30.1.1
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 28 06:40:21 UTC 2020 - Fridrich Strba <fstrba@suse.com> Fri Feb 28 06:40:21 UTC 2020 - Fridrich Strba <fstrba@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package openregex # spec file for package openregex
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -24,9 +24,10 @@ License: LGPL-3.0-only
URL: https://github.com/knowitall/%{name} URL: https://github.com/knowitall/%{name}
Source0: https://github.com/knowitall/%{name}/archive/v%{version}.tar.gz Source0: https://github.com/knowitall/%{name}/archive/v%{version}.tar.gz
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.code.findbugs:jsr305)
BuildRequires: mvn(com.google.guava:guava:15.0) BuildRequires: mvn(com.google.guava:guava)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
BuildArch: noarch BuildArch: noarch
@@ -47,7 +48,11 @@ This package contains javadoc for %{name}.
%pom_remove_plugin :scala-maven-plugin %pom_remove_plugin :scala-maven-plugin
%build %build
%{mvn_build} -f -- -Dsource=6 %{mvn_build} -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dmaven.compiler.release=8 \
%endif
-Dsource=8
%install %install
%mvn_install %mvn_install