Accepting request 1117745 from Java:packages:test

bring back scala

OBS-URL: https://build.opensuse.org/request/show/1117745
OBS-URL: https://build.opensuse.org/package/show/Java:packages/parboiled?expand=0&rev=25

parboiled-build.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b426cd0ac656fe6c6d19037a13766a8214195517d409c2d2b62beed0f48087a
+oid sha256:6d42ce8255879b4b0996f08c5bec8ddfbd270ca10a2a7b3259a3b9bc8a3056a8
-size 2856
+size 2768

parboiled-scala_2.13-1.4.1.pom

@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.parboiled</groupId>
+    <artifactId>parboiled-scala_2.13</artifactId>
+    <packaging>jar</packaging>
+    <description>Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful</description>
+    <url>http://parboiled.org</url>
+    <version>1.4.1</version>
+    <licenses>
+        <license>
+            <name>Apache 2</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <name>parboiled-scala</name>
+    <inceptionYear>2009</inceptionYear>
+    <organization>
+        <name>org.parboiled</name>
+        <url>http://parboiled.org</url>
+    </organization>
+    <scm>
+        <url>git@github.com:sirthias/parboiled.git</url>
+        <connection>scm:git:git@github.com:sirthias/parboiled.git</connection>
+    </scm>
+    <developers>
+        <developer>
+            <id>sirthias</id>
+            <name>Mathias Doenitz</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>2.13.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.parboiled</groupId>
+            <artifactId>parboiled-core</artifactId>
+            <version>1.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.scalatestplus</groupId>
+            <artifactId>testng-7-5_2.13</artifactId>
+            <version>3.2.11.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.scalatest</groupId>
+            <artifactId>scalatest_2.13</artifactId>
+            <version>3.2.11</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

parboiled.changes

@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Wed Oct 11 07:22:30 UTC 2023 - Fridrich Strba <fstrba@suse.com>
-
-- Do not build the scala subpackage, since it is not needed by any
-  package
-
 -------------------------------------------------------------------
 Fri Oct  6 11:26:05 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

parboiled.spec

@@ -16,6 +16,7 @@
 #
 
 
+%global scala_short_version 2.13
 Name:           parboiled
 Version:        1.4.1
 Release:        0
@@ -28,12 +29,14 @@ Source1:        %{name}-build.tar.xz
 # for build see https://github.com/sirthias/parboiled/wiki/Building-parboiled
 Source2:        https://repo1.maven.org/maven2/org/parboiled/%{name}-core/%{version}/%{name}-core-%{version}.pom
 Source3:        https://repo1.maven.org/maven2/org/parboiled/%{name}-java/%{version}/%{name}-java-%{version}.pom
+Source4:        https://repo1.maven.org/maven2/org/parboiled/%{name}-scala_%{scala_short_version}/%{version}/%{name}-scala_%{scala_short_version}-%{version}.pom
 Patch0:         restore-java8-compatibility.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  objectweb-asm
+BuildRequires:  scala-ant
 BuildArch:      noarch
 
 %description
@@ -44,6 +47,20 @@ specifying syntax, they make a replacement for regular expressions
 and generally have some advantages over the "traditional" way of
 building parser via CFGs.
 
+%package scala
+Summary:        Parboiled for Scala
+Group:          Development/Libraries/Java
+
+%description scala
+An internal Scala DSL for efficiently defining your parser rules.
+
+parboiled is a mixed Java/Scala library providing parsing of
+arbitrary input text based on Parsing expression grammars (PEGs).
+PEGs are an alternative to context free grammars (CFGs) for formally
+specifying syntax, they make a replacement for regular expressions
+and generally have some advantages over the "traditional" way of
+building parser via CFGs.
+
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation/HTML
@@ -57,16 +74,17 @@ This package contains javadoc for %{name}.
 
 cp %{SOURCE2} %{name}-core/pom.xml
 cp %{SOURCE3} %{name}-java/pom.xml
+cp %{SOURCE4} %{name}-scala/pom.xml
 
 %build
 mkdir -p lib
 build-jar-repository -s lib \
-	objectweb-asm
+	objectweb-asm scala
 %{ant} \
 	package javadoc
 
 %install
-%global modules core java
+%global modules core java scala
 install -dm 0755 %{buildroot}%{_javadir}/%{name}
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 for i in %{modules}; do
@@ -74,7 +92,11 @@ for i in %{modules}; do
   install -pm 0644 %{name}-${i}/target/%{name}-${i}*%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
   # pom
   %{mvn_install_pom} %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
-  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
+  if [ "${i}" = scala ]; then
+    %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f scala
+  else
+    %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
+  fi
   # javadoc
   install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i}
   cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/
@@ -85,6 +107,9 @@ done
 %doc CHANGELOG README.markdown
 %license LICENSE
 
+%files scala -f .mfiles-scala
+%license LICENSE
+
 %files javadoc
 %license LICENSE
 %{_javadocdir}/%{name}