diff --git a/.files b/.files index 46af5d4..a3c4dd4 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 059775e..cd6e96d 100644 --- a/.rev +++ b/.rev @@ -55,4 +55,12 @@ use mvn_artifact/mvn_install to resolve compat versions 973967 + + eddd112844f828d6e0da6cd60357656b + 2.3.16 + + dimstar_suse + netty3 does not have compat version any more + 975892 + diff --git a/.servicemark b/.servicemark index ef1a2ff..372143b 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -f723f2b227c15a4eef7c3b671fc626cb +46d95a16192afd6675f098895b562809 diff --git a/akka.changes b/akka.changes index c629306..b5aa38d 100644 --- a/akka.changes +++ b/akka.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Apr 30 16:08:34 UTC 2022 - Fridrich Strba + +- Build against io.netty:netty, since the compat versions do not + exist any more + +------------------------------------------------------------------- Fri Apr 29 14:39:47 UTC 2022 - Fridrich Strba - Use %%mvn_artifact and %%mvn_install instead of %%add_maven_depmap diff --git a/akka.spec b/akka.spec index c02db51..fc34ec8 100644 --- a/akka.spec +++ b/akka.spec @@ -48,7 +48,7 @@ BuildRequires: javapackages-tools BuildRequires: mvn(com.google.protobuf:protobuf-java) # typesafe-config BuildRequires: mvn(com.typesafe:config) -BuildRequires: mvn(io.netty:netty:3) +BuildRequires: mvn(io.netty:netty) BuildRequires: mvn(org.osgi:osgi.cmpn) BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.scala-lang:scala-compiler) @@ -88,9 +88,7 @@ sed -i "s|@VERSION@|%{namedversion}|" build.xml %endif # handle compatibility netty jar -sed -i -e "s|netty[.]jar|$(basename %{_javadir}/netty3-*.jar)|" build.xml -cp -p %{SOURCE8} remote-pom.xml -%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='netty']/pom:version" 3 remote-pom.xml +sed -i -e "s|netty[.]jar|$(basename %{_javadir}/netty3.jar)|" build.xml # use osgi 7.x apis cp -p %{SOURCE7} osgi-pom.xml @@ -110,7 +108,7 @@ chmod 644 LICENSE %{mvn_artifact} %{SOURCE5} target/%{name}-dataflow.jar %{mvn_artifact} %{SOURCE6} target/%{name}-kernel.jar %{mvn_artifact} osgi-pom.xml target/%{name}-osgi.jar -%{mvn_artifact} remote-pom.xml target/%{name}-remote.jar +%{mvn_artifact} %{SOURCE8} target/%{name}-remote.jar %{mvn_artifact} %{SOURCE9} target/%{name}-slf4j.jar %{mvn_artifact} %{SOURCE10} target/%{name}-transactor.jar