2024-11-14 07:01:37 +00:00
committed by Git OBS Bridge
parent 8a3cc3683c
commit c31ca02532
2 changed files with 16 additions and 5 deletions

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Mar 8 08:30:56 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Fix build breakage on SLE-15-SP2 after javapackages-tools upgrade
-------------------------------------------------------------------
Mon May 23 05:24:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8
-------------------------------------------------------------------
Sun Nov 24 12:32:45 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package google-http-java-client
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@ Group: Development/Libraries/Java
URL: https://github.com/google/google-http-java-client/
Source0: https://github.com/google/google-http-java-client/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: maven-local
BuildRequires: protobuf-devel
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
@@ -138,8 +139,7 @@ This package contains javadoc for %{name}.
%pom_remove_plugin -r :maven-deploy-plugin
%pom_remove_plugin :maven-release-plugin
%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:executions"
%pom_remove_plugin :maven-javadoc-plugin
# kr.motd.maven:os-maven-plugin:1.4.0.Final
%pom_xpath_remove -r "pom:build/pom:extensions"
@@ -238,10 +238,11 @@ rm -r google-http-client/src/test/java/com/google/api/client/http/apache/ApacheH
%build
%{mvn_build} -s -f \
%{mvn_build} -s -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=6
-Dmaven.compiler.release=8 \
%endif
-Dsource=8
%install
%mvn_install