From 3f203c55912765f5666ff406daf24436e80cbb8ad87b057295fcbc25fbc056ef Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 14 Oct 2023 05:24:27 +0000 Subject: [PATCH] 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 | 4 +-- parboiled-scala_2.13-1.4.1.pom | 57 ++++++++++++++++++++++++++++++++++ parboiled.changes | 6 ---- parboiled.spec | 31 ++++++++++++++++-- 4 files changed, 87 insertions(+), 11 deletions(-) create mode 100644 parboiled-scala_2.13-1.4.1.pom diff --git a/parboiled-build.tar.xz b/parboiled-build.tar.xz index 8b26c57..6ab43fe 100644 --- a/parboiled-build.tar.xz +++ b/parboiled-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b426cd0ac656fe6c6d19037a13766a8214195517d409c2d2b62beed0f48087a -size 2856 +oid sha256:6d42ce8255879b4b0996f08c5bec8ddfbd270ca10a2a7b3259a3b9bc8a3056a8 +size 2768 diff --git a/parboiled-scala_2.13-1.4.1.pom b/parboiled-scala_2.13-1.4.1.pom new file mode 100644 index 0000000..5d0222a --- /dev/null +++ b/parboiled-scala_2.13-1.4.1.pom @@ -0,0 +1,57 @@ + + + 4.0.0 + org.parboiled + parboiled-scala_2.13 + jar + Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful + http://parboiled.org + 1.4.1 + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + parboiled-scala + 2009 + + org.parboiled + http://parboiled.org + + + git@github.com:sirthias/parboiled.git + scm:git:git@github.com:sirthias/parboiled.git + + + + sirthias + Mathias Doenitz + + + + + org.scala-lang + scala-library + 2.13.8 + + + org.parboiled + parboiled-core + 1.4.1 + + + org.scalatestplus + testng-7-5_2.13 + 3.2.11.0 + test + + + org.scalatest + scalatest_2.13 + 3.2.11 + test + + + \ No newline at end of file diff --git a/parboiled.changes b/parboiled.changes index 59fc691..c7224dd 100644 --- a/parboiled.changes +++ b/parboiled.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Oct 11 07:22:30 UTC 2023 - Fridrich Strba - -- Do not build the scala subpackage, since it is not needed by any - package - ------------------------------------------------------------------- Fri Oct 6 11:26:05 UTC 2023 - Fridrich Strba diff --git a/parboiled.spec b/parboiled.spec index 82d340f..cdd9dc3 100644 --- a/parboiled.spec +++ b/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}