pool/google-guice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/google-guice?expand=0&rev=7

Browse Source
This commit is contained in:
Fridrich Strba 2021-05-11 12:49:27 +00:00 committed by Git OBS Bridge
parent 38afb069f8
commit c6b4fb4bbf
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
google-guice-throwingproviderbinder.patch Normal file
View File

@ -0,0 +1,11 @@
--- google-guice-4.1/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java 2019-04-03 09:27:26.000000000 +0200
+++ google-guice-4.1/extensions/throwingproviders/src/com/google/inject/throwingproviders/ThrowingProviderBinder.java 2021-05-11 14:44:01.099881499 +0200
@@ -565,5 +565,8 @@
@Override public boolean apply(Method input) {
return !input.isBridge() && !input.isSynthetic();
}
+ @Override public boolean test(Method input) {
+ return apply(input);
+ }
}
}

8
google-guice.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 11 12:46:28 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Do not build against the compatibility guava20
- Added patch:
* google-guice-throwingproviderbinder.patch
+ fix a little glitch with default generic function in guava
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 3 07:41:22 UTC 2019 - Fridrich Strba <fstrba@suse.com> Wed Apr 3 07:41:22 UTC 2019 - Fridrich Strba <fstrba@suse.com>

10
google-guice.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package google # spec file for package google-guice
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # 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
@ -30,6 +30,7 @@ Source1: create-tarball.sh
Patch0: guice-4.1-fixup-ant.patch Patch0: guice-4.1-fixup-ant.patch
Patch1: guice-4.1-disabledextensions.patch Patch1: guice-4.1-disabledextensions.patch
Patch2: guice-4.1-javadoc.patch Patch2: guice-4.1-javadoc.patch
Patch3: google-guice-throwingproviderbinder.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: aopalliance BuildRequires: aopalliance
BuildRequires: aqute-bnd BuildRequires: aqute-bnd
@ -37,7 +38,7 @@ BuildRequires: atinject
BuildRequires: cglib BuildRequires: cglib
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: glassfish-servlet-api BuildRequires: glassfish-servlet-api
BuildRequires: guava20 BuildRequires: guava
BuildRequires: jarjar BuildRequires: jarjar
BuildRequires: java-devel >= 1.7 BuildRequires: java-devel >= 1.7
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -156,6 +157,7 @@ This package provides %{summary}.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
find . -name "*.jar" -and ! -name "munge.jar" -delete find . -name "*.jar" -and ! -name "munge.jar" -delete
find . -name "*.class" -delete find . -name "*.class" -delete
@ -217,7 +219,7 @@ find . -name "*.class" -delete
mkdir -p lib/build mkdir -p lib/build
mkdir -p extensions/servlet/lib/build mkdir -p extensions/servlet/lib/build
build-jar-repository -s -p lib/build \ build-jar-repository -s -p lib/build \
guava20 javax.inject glassfish-servlet-api aopalliance cglib objectweb-asm aqute-bnd jarjar guava javax.inject glassfish-servlet-api aopalliance cglib objectweb-asm aqute-bnd jarjar
%{ant} clean.all no_aop %{ant} clean.all no_aop
pushd build/no_aop pushd build/no_aop
%pom_xpath_inject "pom:project" "<classifier>no_aop</classifier>" core %pom_xpath_inject "pom:project" "<classifier>no_aop</classifier>" core