Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package typesafe-config for openSUSE:Factory
checked in at 2022-04-20 16:54:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/typesafe-config (Old)
and /work/SRC/openSUSE:Factory/.typesafe-config.new.1941 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "typesafe-config"
Wed Apr 20 16:54:50 2022 rev:6 rq:970690 version:1.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/typesafe-config/typesafe-config.changes
2022-03-29 19:45:40.492138826 +0200
+++
/work/SRC/openSUSE:Factory/.typesafe-config.new.1941/typesafe-config.changes
2022-04-20 16:54:53.082485998 +0200
@@ -1,0 +2,5 @@
+Thu Apr 14 11:02:58 UTC 2022 - Stefan Bluhm <[email protected]>
+
+- Added build on Enterprise Linux 9.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ typesafe-config.spec ++++++
--- /var/tmp/diff_new_pack.NZkrmH/_old 2022-04-20 16:54:53.786486656 +0200
+++ /var/tmp/diff_new_pack.NZkrmH/_new 2022-04-20 16:54:53.790486659 +0200
@@ -29,6 +29,10 @@
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
+%if 0%{?rhel} >= 9
+BuildRequires: xmvn-tools
+%endif
+
BuildArch: noarch
%description
@@ -56,6 +60,7 @@
$(find src/main/java -name \*.java | xargs)
jar -cf target/config.jar -C target/classes .
+%if ! 0%{?rhel} >= 9
mkdir -p target/api
javadoc -d target/api \
-source 8 \
@@ -63,8 +68,16 @@
-group "Public API (version %{version})"
"com.typesafe.config:com.typesafe.config.parser" \
-group "Internal Implementation - Not ABI Stable" "com.typesafe.config.impl"
\
$(find src/main/java -name \*.java | xargs)
+%endif
+
+popd
+cp %{SOURCE1} .
+%mvn_artifact config-%{version}.pom config/target/config.jar
%install
+%if 0%{?rhel}
+%mvn_install
+%else
# jar
install -d -m 755 %{buildroot}%{_javadir}
install -pm 644 config/target/config.jar %{buildroot}%{_javadir}/%{name}.jar
@@ -72,17 +85,23 @@
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar
+%endif
+
+%if ! 0%{?rhel} >= 9
#javadoc
mkdir -p %{buildroot}%{_javadocdir}
cp -a config/target/api %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}
+%endif
%files -f .mfiles
%doc NEWS.md README.md
%license LICENSE-2.0.txt
+%if ! 0%{?rhel} >= 9
%files javadoc
%license LICENSE-2.0.txt
%{_javadocdir}/*
+%endif
%changelog
