Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package scala-stm for openSUSE:Factory checked in at 2023-10-04 22:31:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scala-stm (Old) and /work/SRC/openSUSE:Factory/.scala-stm.new.28202 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scala-stm" Wed Oct 4 22:31:31 2023 rev:3 rq:1114968 version:0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/scala-stm/scala-stm.changes 2021-10-19 23:04:12.905283512 +0200 +++ /work/SRC/openSUSE:Factory/.scala-stm.new.28202/scala-stm.changes 2023-10-04 22:32:29.269888637 +0200 @@ -1,0 +2,5 @@ +Tue Oct 3 09:31:36 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Remove dependency on sbt and allow building with java 9+ + +------------------------------------------------------------------- New: ---- scala-stm_2.10-0.7.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scala-stm.spec ++++++ --- /var/tmp/diff_new_pack.nznU6Z/_old 2023-10-04 22:32:30.333927095 +0200 +++ /var/tmp/diff_new_pack.nznU6Z/_new 2023-10-04 22:32:30.333927095 +0200 @@ -1,7 +1,7 @@ # # spec file for package scala-stm # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,18 +25,13 @@ Group: Development/Libraries/Java URL: https://nbronson.github.io/scala-stm/ Source0: https://github.com/nbronson/scala-stm/archive/release-%{version}.tar.gz -BuildRequires: ant +Source1: https://repo1.maven.org/maven2/org/%{name}/%{name}_%{scala_short_version}/%{version}/%{name}_%{scala_short_version}-%{version}.pom BuildRequires: fdupes BuildRequires: java-devel BuildRequires: javapackages-local -BuildRequires: sbt +BuildRequires: scala BuildRequires: xmvn-install BuildRequires: xmvn-resolve -BuildRequires: mvn(org.scala-lang:scala-compiler) -BuildRequires: mvn(org.scala-lang:scala-library) -BuildConflicts: java >= 9 -BuildConflicts: java-devel >= 9 -BuildConflicts: java-headless >= 9 BuildArch: noarch %description @@ -69,33 +64,22 @@ # get rid of sbt plugins rm project/plugins.sbt -# patch build.sbt -sed -i -e '/% "test"/d' build.sbt -sed -i -e '/credentials/d' build.sbt -sed -i -e 's/\(scalaVersion :=\).*$/scalaVersion := "2.10.7"/' build.sbt -sed -i -e 's/sbt[.]version=.*/sbt.version=0.13.18/g' project/build.properties - # delete tests due to missing deps rm -rf src/test rm -rf dep-tests -cp -rL %{_datadir}/sbt/ivy-local . -mkdir boot - %{mvn_file} org.%{name}:%{name}_%{scala_short_version} %{name} %build - -export SBT_BOOT_DIR=$PWD/boot -export SBT_IVY_DIR=$PWD/ivy-local -sbt -Dsbt.log.noformat=true package makePom deliverLocal doc - -# No test deps available +mkdir -p target/classes +scalac -nobootcp -d target/classes $(find src/main -name \*.scala | xargs) +jar -cf target/%{name}_%{scala_short_version}-%{version}.jar -C target/classes . +mkdir -p target/apidoc +scaladoc -nobootcp -d target/apidoc $(find src/main -name \*.scala | xargs) %install -# target/scala-2.10/scala-stm_2.10-0.7.jar -%{mvn_artifact} target/scala-%{scala_short_version}/%{name}_%{scala_short_version}-%{version}.pom target/scala-%{scala_short_version}/%{name}_%{scala_short_version}-%{version}.jar -%mvn_install -J target/scala-%{scala_short_version}/api/ +%{mvn_artifact} %{SOURCE1} target/%{name}_%{scala_short_version}-%{version}.jar +%mvn_install -J target/apidoc/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles ++++++ scala-stm_2.10-0.7.pom ++++++ <?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.scala-stm</groupId> <artifactId>scala-stm_2.10</artifactId> <packaging>jar</packaging> <description>scala-stm</description> <version>0.7</version> <name>scala-stm</name> <organization> <name>org.scala-stm</name> </organization> <url>http://nbronson.github.com/scala-stm/</url> <licenses> <license> <name>BSD</name> <url>https://github.com/nbronson/scala-stm/blob/master/LICENSE.txt</url> <distribution>repo</distribution> </license> </licenses> <scm> <connection>scm:git:g...@github.com:nbronson/scala-stm.git</connection> <url>g...@github.com:nbronson/scala-stm.git</url> </scm> <developers> <developer> <id>nbronson</id> <name>Nathan Bronson</name> <email>ngbron...@gmail.com</email> </developer> </developers> <dependencies> <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> <version>2.10.0</version> </dependency> </dependencies> </project> (No newline at EOF)
