Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package google-guice for openSUSE:Factory
checked in at 2021-05-12 19:32:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-guice (Old)
and /work/SRC/openSUSE:Factory/.google-guice.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-guice"
Wed May 12 19:32:07 2021 rev:2 rq:892403 version:4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/google-guice/google-guice.changes
2019-04-03 10:51:44.725937115 +0200
+++ /work/SRC/openSUSE:Factory/.google-guice.new.2988/google-guice.changes
2021-05-12 19:32:37.430943737 +0200
@@ -1,0 +2,8 @@
+Tue May 11 12:46:28 UTC 2021 - Fridrich Strba <fst...@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
+
+-------------------------------------------------------------------
New:
----
google-guice-throwingproviderbinder.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-guice.spec ++++++
--- /var/tmp/diff_new_pack.Eda4Ny/_old 2021-05-12 19:32:37.950941660 +0200
+++ /var/tmp/diff_new_pack.Eda4Ny/_new 2021-05-12 19:32:37.950941660 +0200
@@ -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
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,7 @@
Patch0: guice-4.1-fixup-ant.patch
Patch1: guice-4.1-disabledextensions.patch
Patch2: guice-4.1-javadoc.patch
+Patch3: google-guice-throwingproviderbinder.patch
BuildRequires: ant
BuildRequires: aopalliance
BuildRequires: aqute-bnd
@@ -37,7 +38,7 @@
BuildRequires: cglib
BuildRequires: fdupes
BuildRequires: glassfish-servlet-api
-BuildRequires: guava20
+BuildRequires: guava
BuildRequires: jarjar
BuildRequires: java-devel >= 1.7
BuildRequires: javapackages-local
@@ -156,6 +157,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
find . -name "*.jar" -and ! -name "munge.jar" -delete
find . -name "*.class" -delete
@@ -217,7 +219,7 @@
mkdir -p lib/build
mkdir -p extensions/servlet/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
pushd build/no_aop
%pom_xpath_inject "pom:project" "<classifier>no_aop</classifier>" core
++++++ google-guice-throwingproviderbinder.patch ++++++
---
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);
+ }
}
}
