From c8a5ac8d6856d0410b9ec7f2074fd8a67c0e086f Mon Sep 17 00:00:00 2001
From: fstrba <>
Date: Apr 19 2021 19:25:32 +0000
Subject: Update akka to version 2.3.16 / rev 3 via SR 886711


https://build.opensuse.org/request/show/886711
by user fstrba + dimstar_suse
Fix build with typesafe-config >= 1.3

---

diff --git a/.files b/.files
index 53d8cce..44f6b25 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 6bf6c83..af6d803 100644
--- a/.rev
+++ b/.rev
@@ -15,4 +15,12 @@
     <comment>Avoid fat dependencies</comment>
     <requestid>792661</requestid>
   </revision>
+  <revision rev="3" vrev="3">
+    <srcmd5>298bde5bbc13f41c20b1daf995f69c41</srcmd5>
+    <version>2.3.16</version>
+    <time>1618859193</time>
+    <user>dimstar_suse</user>
+    <comment>Fix build with typesafe-config &gt;= 1.3</comment>
+    <requestid>886711</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
new file mode 100644
index 0000000..5917f20
--- /dev/null
+++ b/.servicemark
@@ -0,0 +1 @@
+aca3fd2d3258a6169deb4b9df869faac
diff --git a/akka-2.3.0-typesafe-config-1.3.0.patch b/akka-2.3.0-typesafe-config-1.3.0.patch
new file mode 100644
index 0000000..5a2f773
--- /dev/null
+++ b/akka-2.3.0-typesafe-config-1.3.0.patch
@@ -0,0 +1,20 @@
+--- akka-2.3.16/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala
++++ akka-2.3.16/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala
+@@ -178,5 +178,17 @@
+   def resolveWith(source: Config, options: ConfigResolveOptions) = config.resolveWith(source, options)
+ 
+   def resolveWith(source: Config) = config.resolveWith(source)
++
++  def getDuration(path: String) = config.getDuration(path)
++
++  def getDurationList(path: String) = config.getDurationList(path)
++
++  def getIsNull(path: String) = config.getIsNull(path)
++
++  def getMemorySize(path: String) = config.getMemorySize(path)
++
++  def getMemorySizeList(path: String) = config.getMemorySizeList(path)
++
++  def hasPathOrNull(path: String) = config.hasPathOrNull(path)
+ }
+ 
diff --git a/akka.changes b/akka.changes
index 8315a05..890594a 100644
--- a/akka.changes
+++ b/akka.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Mon Apr 19 14:18:00 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * akka-2.3.0-typesafe-config-1.3.0.patch
+    + conditionally applied patch to be able to build against
+      typesafe-config >= 1.3
+
+-------------------------------------------------------------------
 Thu Apr  9 09:03:21 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
 - Don't build against eclipse-osgi, but again osgi-core and
diff --git a/akka.spec b/akka.spec
index d115eba..13ef5e6 100644
--- a/akka.spec
+++ b/akka.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package akka
 #
-# Copyright (c) 2020 SUSE LLC
+# 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
@@ -40,6 +40,7 @@ Source8:        https://repo1.maven.org/maven2/com/typesafe/akka/akka-remote_%{s
 Source9:        https://repo1.maven.org/maven2/com/typesafe/akka/akka-slf4j_%{scala_short_version}/%{namedversion}/akka-slf4j_%{scala_short_version}-%{namedversion}.pom
 Source10:       https://repo1.maven.org/maven2/com/typesafe/akka/akka-transactor_%{scala_short_version}/%{namedversion}/akka-transactor_%{scala_short_version}-%{namedversion}.pom
 Patch0:         akka-2.3.0-encoding.patch
+Patch1:         akka-2.3.0-typesafe-config-1.3.0.patch
 BuildRequires:  ant
 BuildRequires:  java-devel
 BuildRequires:  javapackages-local
@@ -87,6 +88,9 @@ cp -p %{SOURCE1} build.xml
 sed -i "s|@VERSION@|%{namedversion}|" build.xml
 
 %patch0 -p1
+%if %{?pkg_vcmp:%pkg_vcmp typesafe-config >= 1.3}%{!?pkg_vcmp:0}
+%patch1 -p1
+%endif
 
 # handle compatibility netty jar
 sed -i -e "s|netty[.]jar|$(basename %{_javadir}/netty3-*.jar)|" build.xml