Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package test-interface for openSUSE:Factory checked in at 2022-03-24 22:57:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/test-interface (Old) and /work/SRC/openSUSE:Factory/.test-interface.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "test-interface" Thu Mar 24 22:57:21 2022 rev:2 rq:964358 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/test-interface/test-interface.changes 2019-11-13 13:29:03.387743393 +0100 +++ /work/SRC/openSUSE:Factory/.test-interface.new.1900/test-interface.changes 2022-03-24 22:57:42.736233842 +0100 @@ -1,0 +2,6 @@ +Wed Mar 23 18:57:10 UTC 2022 - Fridrich Strba <[email protected]> + +- Build with java source and target levels 8 +- Simplify the spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ test-interface.spec ++++++ --- /var/tmp/diff_new_pack.gM77M3/_old 2022-03-24 22:57:43.232234321 +0100 +++ /var/tmp/diff_new_pack.gM77M3/_new 2022-03-24 22:57:43.236234325 +0100 @@ -1,7 +1,7 @@ # # spec file for package test-interface # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -17,7 +17,6 @@ %global test_interface_version 1.0 -%global build_with_sbt 0 Name: test-interface Version: %{test_interface_version} Release: 0 @@ -26,19 +25,11 @@ Group: Development/Libraries/Java URL: https://github.com/sbt/test-interface Source0: https://github.com/sbt/test-interface/archive/v%{test_interface_version}.tar.gz +Source1: https://repo1.maven.org/maven2/org/scala-sbt/%{name}/%{version}/%{name}-%{version}.pom BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve BuildArch: noarch -%if ! %{build_with_sbt} -Source1: http://central.maven.org/maven2/org/scala-sbt/%{name}/%{version}/%{name}-%{version}.pom -%endif -%if %{build_with_sbt} -BuildRequires: sbt -%else -BuildRequires: java-devel -%endif %description @@ -56,32 +47,9 @@ %setup -q %{mvn_file} org.scala-sbt:test-interface %{name} -%if %{build_with_sbt} -sed -i -e 's/2[.]10[.]2/2.10.3/g' build.sbt -sed -i -e '/scalatest_2.10/d' build.sbt - -sed -i -e 's/0[.]12[.]4/0.13.1/g' project/build.properties -rm project/plugins.sbt - -cp -r %{_datadir}/java/sbt/ivy-local . -mkdir boot -%else # building without sbt - -cp -p %{SOURCE1} pom.xml -# Remove unavailable test dep -%pom_remove_dep :scalatest_2.10 - -%endif - %build - -%if %{build_with_sbt} -export SBT_BOOT_DIR=boot -export SBT_IVY_DIR=ivy-local -sbt package deliverLocal publishM2Configuration -%else # building without sbt mkdir -p classes target/api -%javac -source 6 -target 6 -d classes $(find src/main/java -name "*.java") +%javac -source 8 -target 8 -d classes $(find src/main/java -name "*.java") ( cd classes @@ -99,24 +67,29 @@ %jar -cMf ../target/%{name}.jar * ) -%{javadoc} -source 6 -d target/api -classpath $PWD/target/%{name}.jar $(find src/main/java -name "*.java") - -cp pom.xml target/%{name}-%{version}.pom - -%{mvn_artifact} target/%{name}-%{version}.pom target/%{name}.jar - -%endif +%{javadoc} -source 8 -d target/api -classpath $PWD/target/%{name}.jar $(find src/main/java -name "*.java") %install - -%mvn_install -J target/api +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar + +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar + +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/api/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %license LICENSE %doc README -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE %changelog
