Accepting request 1117747 from Java:packages
Bring back the scala subpackage built against the new scala OBS-URL: https://build.opensuse.org/request/show/1117747 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/parboiled?expand=0&rev=7
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
ed57c5fe32
3
_multibuild
Normal file
3
_multibuild
Normal file
@ -0,0 +1,3 @@
|
||||
<multibuild>
|
||||
<package>scala</package>
|
||||
</multibuild>
|
||||
BIN
parboiled-build.tar.xz
(Stored with Git LFS)
BIN
parboiled-build.tar.xz
(Stored with Git LFS)
Binary file not shown.
57
parboiled-scala_2.13-1.4.1.pom
Normal file
57
parboiled-scala_2.13-1.4.1.pom
Normal file
@ -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>
|
||||
@ -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>
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package parboiled
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
@ -16,27 +16,50 @@
|
||||
#
|
||||
|
||||
|
||||
Name: parboiled
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
%if "%{flavor}" == "scala"
|
||||
%bcond_without scala
|
||||
%else
|
||||
%bcond_with scala
|
||||
%endif
|
||||
%global scala_short_version 2.13
|
||||
%global base_name parboiled
|
||||
%if %{with scala}
|
||||
Name: %{base_name}-scala
|
||||
Summary: Parboiled for Scala
|
||||
%else
|
||||
Name: %{base_name}
|
||||
Summary: Java library providing parsing of input text based on PEGs
|
||||
%endif
|
||||
Version: 1.4.1
|
||||
Release: 0
|
||||
Summary: Java library providing parsing of input text based on PEGs
|
||||
License: Apache-2.0
|
||||
Group: Development/Libraries/Java
|
||||
URL: http://parboiled.org/
|
||||
Source0: https://github.com/sirthias/parboiled/archive/%{version}.tar.gz
|
||||
Source1: %{name}-build.tar.xz
|
||||
Source1: %{base_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
|
||||
Source2: https://repo1.maven.org/maven2/org/parboiled/%{base_name}-core/%{version}/%{base_name}-core-%{version}.pom
|
||||
Source3: https://repo1.maven.org/maven2/org/parboiled/%{base_name}-java/%{version}/%{base_name}-java-%{version}.pom
|
||||
Source4: https://repo1.maven.org/maven2/org/parboiled/%{base_name}-scala_%{scala_short_version}/%{version}/%{base_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: javapackages-local >= 6
|
||||
%if %{with scala}
|
||||
BuildRequires: parboiled
|
||||
BuildRequires: scala-ant
|
||||
%else
|
||||
BuildRequires: objectweb-asm
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
%if %{with scala}
|
||||
An internal Scala DSL for efficiently defining your parser rules.
|
||||
|
||||
%endif
|
||||
parboiled is a mixed Java library providing parsing of
|
||||
arbitrary input text based on Parsing expression grammars (PEGs).
|
||||
PEGs are an alternative to context free grammars (CFGs) for formally
|
||||
@ -49,35 +72,47 @@ Summary: Javadoc for %{name}
|
||||
Group: Documentation/HTML
|
||||
|
||||
%description javadoc
|
||||
This package contains javadoc for %{name}.
|
||||
This package contains javadoc for %{base_name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version} -a1
|
||||
%setup -q -n %{base_name}-%{version} -a1
|
||||
%patch0 -p1
|
||||
|
||||
cp %{SOURCE2} %{name}-core/pom.xml
|
||||
cp %{SOURCE3} %{name}-java/pom.xml
|
||||
cp %{SOURCE2} %{base_name}-core/pom.xml
|
||||
cp %{SOURCE3} %{base_name}-java/pom.xml
|
||||
cp %{SOURCE4} %{base_name}-scala/pom.xml
|
||||
|
||||
%build
|
||||
mkdir -p lib
|
||||
build-jar-repository -s lib \
|
||||
%if %{with scala}
|
||||
%{base_name} scala
|
||||
%else
|
||||
objectweb-asm
|
||||
%endif
|
||||
%{ant} \
|
||||
%if %{with scala}
|
||||
-f build-scala.xml \
|
||||
%endif
|
||||
package javadoc
|
||||
|
||||
%install
|
||||
%if %{with scala}
|
||||
%global modules scala
|
||||
%else
|
||||
%global modules core java
|
||||
install -dm 0755 %{buildroot}%{_javadir}/%{name}
|
||||
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
|
||||
%endif
|
||||
install -dm 0755 %{buildroot}%{_javadir}/%{base_name}
|
||||
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{base_name}
|
||||
for i in %{modules}; do
|
||||
# jar
|
||||
install -pm 0644 %{name}-${i}/target/%{name}-${i}*%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
|
||||
install -pm 0644 %{base_name}-${i}/target/%{base_name}-${i}*%{version}.jar %{buildroot}%{_javadir}/%{base_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
|
||||
%{mvn_install_pom} %{base_name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}/${i}.pom
|
||||
%add_maven_depmap %{base_name}/${i}.pom %{base_name}/${i}.jar
|
||||
# javadoc
|
||||
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/${i}
|
||||
cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/${i}/
|
||||
install -dm 0755 %{buildroot}%{_javadocdir}/%{base_name}/${i}
|
||||
cp -pr %{base_name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{base_name}/${i}/
|
||||
done
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
|
||||
@ -87,6 +122,6 @@ done
|
||||
|
||||
%files javadoc
|
||||
%license LICENSE
|
||||
%{_javadocdir}/%{name}
|
||||
%{_javadocdir}/%{base_name}
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user