From 4de0e4856ca0cc9295c120d22c4c6b388a7b7f5a Mon Sep 17 00:00:00 2001
From: Bernhard M. Wiedemann <bwiedemann+opensusegit@suse.de>
Date: Mar 30 2022 00:45:15 +0000
Subject: update 2022-03-30 00:45


---

diff --git a/packages/_/_project/_staging_workflow b/packages/_/_project/_staging_workflow
index ab939b6..cea4e4f 100644
--- a/packages/_/_project/_staging_workflow
+++ b/packages/_/_project/_staging_workflow
@@ -16,27 +16,23 @@
   <staging_project name="openSUSE:Factory:Staging:O"/>
   <staging_project name="openSUSE:Factory:Staging:D"/>
   <staging_project name="openSUSE:Factory:Staging:adi:29"/>
-  <staging_project name="openSUSE:Factory:Staging:adi:11"/>
   <staging_project name="openSUSE:Factory:Staging:adi:43"/>
   <staging_project name="openSUSE:Factory:Staging:adi:30"/>
   <staging_project name="openSUSE:Factory:Staging:adi:16"/>
   <staging_project name="openSUSE:Factory:Staging:adi:1"/>
   <staging_project name="openSUSE:Factory:Staging:adi:24"/>
-  <staging_project name="openSUSE:Factory:Staging:adi:14"/>
   <staging_project name="openSUSE:Factory:Staging:adi:18"/>
   <staging_project name="openSUSE:Factory:Staging:adi:44"/>
   <staging_project name="openSUSE:Factory:Staging:adi:45"/>
   <staging_project name="openSUSE:Factory:Staging:adi:15"/>
   <staging_project name="openSUSE:Factory:Staging:adi:28"/>
   <staging_project name="openSUSE:Factory:Staging:adi:42"/>
-  <staging_project name="openSUSE:Factory:Staging:adi:50"/>
-  <staging_project name="openSUSE:Factory:Staging:adi:51"/>
-  <staging_project name="openSUSE:Factory:Staging:adi:48"/>
-  <staging_project name="openSUSE:Factory:Staging:adi:52"/>
-  <staging_project name="openSUSE:Factory:Staging:adi:53"/>
-  <staging_project name="openSUSE:Factory:Staging:adi:54"/>
   <staging_project name="openSUSE:Factory:Staging:adi:2"/>
+  <staging_project name="openSUSE:Factory:Staging:adi:5"/>
+  <staging_project name="openSUSE:Factory:Staging:adi:6"/>
   <staging_project name="openSUSE:Factory:Staging:adi:3"/>
   <staging_project name="openSUSE:Factory:Staging:adi:4"/>
-  <staging_project name="openSUSE:Factory:Staging:adi:5"/>
+  <staging_project name="openSUSE:Factory:Staging:adi:7"/>
+  <staging_project name="openSUSE:Factory:Staging:adi:8"/>
+  <staging_project name="openSUSE:Factory:Staging:adi:9"/>
 </workflow>
diff --git a/packages/f/frescobaldi/.files b/packages/f/frescobaldi/.files
index e761b68..84f8e3a 100644
Binary files a/packages/f/frescobaldi/.files and b/packages/f/frescobaldi/.files differ
diff --git a/packages/f/frescobaldi/.rev b/packages/f/frescobaldi/.rev
index 303a3fb..7475cbc 100644
--- a/packages/f/frescobaldi/.rev
+++ b/packages/f/frescobaldi/.rev
@@ -180,4 +180,12 @@
   accordingly</comment>
     <requestid>943724</requestid>
   </revision>
+  <revision rev="22" vrev="3">
+    <srcmd5>261b66a57da254f9ddae9dbd46bb835a</srcmd5>
+    <version>3.1.3</version>
+    <time>1648580823</time>
+    <user>dimstar_suse</user>
+    <comment>- lilypond is not available on i586, so exclude that arch</comment>
+    <requestid>965745</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/f/frescobaldi/frescobaldi.changes b/packages/f/frescobaldi/frescobaldi.changes
index c4fab0e..dbdd45b 100644
--- a/packages/f/frescobaldi/frescobaldi.changes
+++ b/packages/f/frescobaldi/frescobaldi.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Tue Mar 29 17:47:49 UTC 2022 - Cor Blom <cornelis@solcon.nl>
+
+- lilypond is not available on i586, so exclude that arch
+
+-------------------------------------------------------------------
 Tue Jan  4 09:24:46 UTC 2022 - Cor Blom <cornelis@solcon.nl>
 
 - Portmidi has been updated. Change the libpormidi recommends
diff --git a/packages/f/frescobaldi/frescobaldi.spec b/packages/f/frescobaldi/frescobaldi.spec
index 2fd47d3..9fd26e9 100644
--- a/packages/f/frescobaldi/frescobaldi.spec
+++ b/packages/f/frescobaldi/frescobaldi.spec
@@ -16,6 +16,8 @@
 #
 
 
+ExcludeArch:    i586
+
 Name:           frescobaldi
 Summary:        Lilypond editor
 License:        GPL-2.0-or-later
diff --git a/packages/m/maven-jar-plugin/.files b/packages/m/maven-jar-plugin/.files
index 02ae979..5e9c56e 100644
Binary files a/packages/m/maven-jar-plugin/.files and b/packages/m/maven-jar-plugin/.files differ
diff --git a/packages/m/maven-jar-plugin/.rev b/packages/m/maven-jar-plugin/.rev
index bc970df..590b6db 100644
--- a/packages/m/maven-jar-plugin/.rev
+++ b/packages/m/maven-jar-plugin/.rev
@@ -39,4 +39,12 @@
     <comment>Build with source/target levels 8</comment>
     <requestid>963948</requestid>
   </revision>
+  <revision rev="6" vrev="1">
+    <srcmd5>4964df39983716ba41972caea2ee28d3</srcmd5>
+    <version>3.2.2</version>
+    <time>1648580822</time>
+    <user>dimstar_suse</user>
+    <comment>3.2.2</comment>
+    <requestid>965696</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/m/maven-jar-plugin/01-allow-replacing-artifacts.patch b/packages/m/maven-jar-plugin/01-allow-replacing-artifacts.patch
index a3f425b..cbcdc18 100644
--- a/packages/m/maven-jar-plugin/01-allow-replacing-artifacts.patch
+++ b/packages/m/maven-jar-plugin/01-allow-replacing-artifacts.patch
@@ -1,16 +1,11 @@
-Description: Display a warning instead of failing the build if the plugin
- is misconfigured and attempts to attach twice the same artifact.
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
-Bug: https://issues.apache.org/jira/browse/MJAR-198
---- a/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
-+++ b/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
-@@ -300,7 +300,7 @@
-             {
-                 if ( projectHasAlreadySetAnArtifact() )
-                 {
--                    throw new MojoExecutionException( "You have to use a classifier "
-+                    getLog().warn( "You have to use a classifier "
-                         + "to attach supplemental artifacts to the project instead of replacing them." );
-                 }
-                 getProject().getArtifact().setFile( jarFile );
+--- maven-jar-plugin-3.2.2/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java	2022-03-29 15:50:36.249589766 +0200
++++ maven-jar-plugin-3.2.2/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java	2022-03-29 15:51:59.054148728 +0200
+@@ -317,7 +317,7 @@
+             {
+                 if ( projectHasAlreadySetAnArtifact() )
+                 {
+-                    throw new MojoExecutionException( "You have to use a classifier "
++                    getLog().warn( "You have to use a classifier "
+                         + "to attach supplemental artifacts to the project instead of replacing them." );
+                 }
+                 getProject().getArtifact().setFile( jarFile );
diff --git a/packages/m/maven-jar-plugin/maven-jar-plugin-3.2.0-source-release.zip b/packages/m/maven-jar-plugin/maven-jar-plugin-3.2.0-source-release.zip
deleted file mode 120000
index fc61b10..0000000
--- a/packages/m/maven-jar-plugin/maven-jar-plugin-3.2.0-source-release.zip
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreidgsf5fjajbpigqxwe5wyhakzwivibl37k47zswesaymxlogdskci
\ No newline at end of file
diff --git a/packages/m/maven-jar-plugin/maven-jar-plugin-3.2.2-source-release.zip b/packages/m/maven-jar-plugin/maven-jar-plugin-3.2.2-source-release.zip
new file mode 120000
index 0000000..f3f9910
--- /dev/null
+++ b/packages/m/maven-jar-plugin/maven-jar-plugin-3.2.2-source-release.zip
@@ -0,0 +1 @@
+/ipfs/bafkreibv2kgyfaew7vqyd5xnhkbgp4c42inoa4uxeoblrk7afhdj76xxna
\ No newline at end of file
diff --git a/packages/m/maven-jar-plugin/maven-jar-plugin-build.xml b/packages/m/maven-jar-plugin/maven-jar-plugin-build.xml
index 085558b..f02f7dd 100644
--- a/packages/m/maven-jar-plugin/maven-jar-plugin-build.xml
+++ b/packages/m/maven-jar-plugin/maven-jar-plugin-build.xml
@@ -14,7 +14,7 @@
             value="Builds a Java Archive (JAR) file from the compiled project classes and resources."/>
   <property name="project.groupId" value="org.apache.maven.plugins"/>
   <property name="project.artifactId" value="maven-jar-plugin"/>
-  <property name="project.version" value="3.2.0"/>
+  <property name="project.version" value="3.2.2"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
   <property name="spec.version" value="3.2"/>
diff --git a/packages/m/maven-jar-plugin/maven-jar-plugin.changes b/packages/m/maven-jar-plugin/maven-jar-plugin.changes
index 5c1d223..1dc91c7 100644
--- a/packages/m/maven-jar-plugin/maven-jar-plugin.changes
+++ b/packages/m/maven-jar-plugin/maven-jar-plugin.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Tue Mar 29 13:53:45 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Update to upstream version 3.2.2
+- Modified patch:
+  * 01-allow-replacing-artifacts.patch
+    + rediff to different line endings
+
+-------------------------------------------------------------------
 Tue Mar 22 13:18:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
 - Build with java source and target levels 8
diff --git a/packages/m/maven-jar-plugin/maven-jar-plugin.spec b/packages/m/maven-jar-plugin/maven-jar-plugin.spec
index 4d9f245..bec3a02 100644
--- a/packages/m/maven-jar-plugin/maven-jar-plugin.spec
+++ b/packages/m/maven-jar-plugin/maven-jar-plugin.spec
@@ -23,7 +23,7 @@
 %bcond_with bootstrap
 %endif
 %global base_name maven-jar-plugin
-Version:        3.2.0
+Version:        3.2.2
 Release:        0
 Summary:        Maven JAR Plugin
 License:        Apache-2.0
diff --git a/packages/s/sbt-launcher/.files b/packages/s/sbt-launcher/.files
index ea70add..d9e28a7 100644
Binary files a/packages/s/sbt-launcher/.files and b/packages/s/sbt-launcher/.files differ
diff --git a/packages/s/sbt-launcher/.rev b/packages/s/sbt-launcher/.rev
index 7c3d892..9b58795 100644
--- a/packages/s/sbt-launcher/.rev
+++ b/packages/s/sbt-launcher/.rev
@@ -7,4 +7,12 @@
     <comment>new package</comment>
     <requestid>755296</requestid>
   </revision>
+  <revision rev="2" vrev="2">
+    <srcmd5>390ea2b7bd8eabcfb3c5ef05718f97b2</srcmd5>
+    <version>1.1.2</version>
+    <time>1648580822</time>
+    <user>dimstar_suse</user>
+    <comment>Source/target 8 + fix build against new ivy</comment>
+    <requestid>965694</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/s/sbt-launcher/.servicemark b/packages/s/sbt-launcher/.servicemark
index 0cd0eae..067b763 100644
--- a/packages/s/sbt-launcher/.servicemark
+++ b/packages/s/sbt-launcher/.servicemark
@@ -1 +1 @@
-70da0c2e5b4a703f63c00c64ad2f498d
+89ae0a98f1c2eb6eeb539fa4292f975c
diff --git a/packages/s/sbt-launcher/launcher-ivy.patch b/packages/s/sbt-launcher/launcher-ivy.patch
new file mode 100644
index 0000000..68679b0
--- /dev/null
+++ b/packages/s/sbt-launcher/launcher-ivy.patch
@@ -0,0 +1,53 @@
+--- launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/ParallelResolveEngine.scala	2022-03-19 17:35:29.562544280 +0100
++++ launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/ParallelResolveEngine.scala	2022-03-19 17:46:58.730677371 +0100
+@@ -34,7 +34,7 @@
+ 
+   override def downloadArtifacts(
+     report: ResolveReport,
+-    artifactFilter: Filter,
++    artifactFilter: Filter[Artifact],
+     options: DownloadOptions
+   ): Unit = {
+     import scala.collection.JavaConverters._
+@@ -85,7 +85,7 @@
+    */
+   private def downloadNodeArtifacts(
+     dependency: IvyNode,
+-    artifactFilter: Filter,
++    artifactFilter: Filter[Artifact],
+     options: DownloadOptions
+   ): DownloadResult = {
+ 
+--- launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/ParallelRetrieveEngine.scala	2022-03-19 17:35:29.562544280 +0100
++++ launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/ParallelRetrieveEngine.scala	2022-03-19 17:45:59.218320985 +0100
+@@ -167,7 +167,7 @@
+       if (options.isMakeSymlinks()) {
+         var symlinkCreated = false
+         try {
+-          FileUtil.symlink(archive, destFile, null, true)
++          FileUtil.symlink(archive, destFile, true)
+           symlinkCreated = true
+         } catch {
+           case ioe: IOException =>
+--- launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/Update.scala	2022-03-19 17:35:29.562544280 +0100
++++ launcher-1.1.2/launcher-implementation/src/main/scala/xsbt/boot/Update.scala	2022-03-19 18:04:13.840880157 +0100
+@@ -187,7 +187,7 @@
+   private def excludeRule(organization: String, name: String): ExcludeRule =
+     {
+       val artifact = new ArtifactId(ModuleId.newInstance(organization, name), "*", "*", "*")
+-      val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, java.util.Collections.emptyMap[AnyRef, AnyRef])
++      val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, java.util.Collections.emptyMap[String, String])
+       rule.addConfiguration(DefaultIvyConfiguration)
+       rule
+     }
+@@ -233,8 +233,8 @@
+         problem.printStackTrace(logWriter)
+     }
+   }
+-  private final class ArtifactFilter(f: IArtifact => Boolean) extends Filter {
+-    def accept(o: Any) = o match { case a: IArtifact => f(a); case _ => false }
++  private final class ArtifactFilter(f: IArtifact => Boolean) extends Filter[IArtifact] {
++    def accept(o: IArtifact) = o match { case a: IArtifact => f(a); case _ => false }
+   }
+   /** Retrieves resolved dependencies using the given target to determine the location to retrieve to. */
+   private def retrieve(eventManager: EventManager, module: ModuleDescriptor, target: UpdateTarget, autoScalaVersion: Option[String]): Unit = {
diff --git a/packages/s/sbt-launcher/sbt-launcher.changes b/packages/s/sbt-launcher/sbt-launcher.changes
index fc707fb..6a6d569 100644
--- a/packages/s/sbt-launcher/sbt-launcher.changes
+++ b/packages/s/sbt-launcher/sbt-launcher.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Sat Mar 19 17:08:21 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source/target levels 8
+- Added patch:
+  * launcher-ivy.patch
+    + fix build against ivy 2.5.0
+
+-------------------------------------------------------------------
 Mon Dec  9 15:56:52 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
 - Initial packaging of sbt launcher 1.1.2
diff --git a/packages/s/sbt-launcher/sbt-launcher.spec b/packages/s/sbt-launcher/sbt-launcher.spec
index 0bb6984..989a66c 100644
--- a/packages/s/sbt-launcher/sbt-launcher.spec
+++ b/packages/s/sbt-launcher/sbt-launcher.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package sbt-launcher
+# spec file
 #
-# 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
@@ -28,6 +28,7 @@ Source0:        %{short_name}-%{version}.tar.xz
 Source1:        http://central.maven.org/maven2/org/scala-sbt/%{short_name}-interface/%{version}/%{short_name}-interface-%{version}.pom
 # Generated offline by sbt make-pom and cleaned up
 Source2:        %{short_name}-implementation.pom
+Patch0:         launcher-ivy.patch
 BuildRequires:  apache-ivy
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local
@@ -55,17 +56,18 @@ JavaDoc documentation for %{name}
 
 %prep
 %setup -q -n %{short_name}-%{version}
+%patch0 -p1
 
 %build
 pushd %{short_name}-interface
   cp %{SOURCE1} pom.xml
   # jar
   mkdir -p target/classes
-  javac -d target/classes -source 6 -target 6 $(find src/main -name \*.java | xargs)
+  javac -d target/classes -source 8 -target 8 $(find src/main -name \*.java | xargs)
   jar -cf target/%{short_name}-interface-%{version}.jar -C target/classes .
   # javadoc
   mkdir -p target/site/apidocs
-  javadoc -d target/site/apidocs -source 6 -notimestamp $(find src/main -name \*.java | xargs)
+  javadoc -d target/site/apidocs -source 8 -notimestamp $(find src/main -name \*.java | xargs)
 popd
 %{mvn_artifact} %{short_name}-interface/pom.xml %{short_name}-interface/target/%{short_name}-interface-%{version}.jar
 pushd %{short_name}-implementation
@@ -106,7 +108,7 @@ mv %{short_name}-implementation/target/site/apidocs target/site/apidocs/%{short_
 
 %files interface -f .mfiles-interface
 
-%files javadoc -f .mfiles-javadoc 
+%files javadoc -f .mfiles-javadoc
 %license licenses/LICENSE_Apache licenses/LICENSE_Scala NOTICE
 
 %changelog