From 97f62599fa428fec99ea3ae3be1fee1e9d3a10ccbd3882e15a185fa696dcd174 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 26 Nov 2019 15:16:05 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/truth?expand=0&rev=4

---
 _service          |  4 ++--
 truth-0.23.tar.xz |  3 ---
 truth-0.24.tar.xz |  3 +++
 truth.changes     |  6 ++++++
 truth.spec        | 21 +++++++++++++++++----
 5 files changed, 28 insertions(+), 9 deletions(-)
 delete mode 100644 truth-0.23.tar.xz
 create mode 100644 truth-0.24.tar.xz

diff --git a/_service b/_service
index ca5eeaf..25ec287 100644
--- a/_service
+++ b/_service
@@ -2,8 +2,8 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">git@github.com:google/truth.git</param>
-		<param name="revision">release_0_23</param>
-		<param name="versionformat">0.23</param>
+		<param name="revision">release_0_24</param>
+		<param name="versionformat">0.24</param>
 		<param name="filename">truth</param>
 	</service>
 	<service name="recompress" mode="disabled">
diff --git a/truth-0.23.tar.xz b/truth-0.23.tar.xz
deleted file mode 100644
index 3165d48..0000000
--- a/truth-0.23.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d3c475a134be22bf522196de120c8837de30871c71be1bbea28390747d5d7144
-size 39036
diff --git a/truth-0.24.tar.xz b/truth-0.24.tar.xz
new file mode 100644
index 0000000..06bb726
--- /dev/null
+++ b/truth-0.24.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba0d75a53a0beba6858116ce238fef2005218fc629c374a8885bab76ee04c1b0
+size 48144
diff --git a/truth.changes b/truth.changes
index 339dcba..a9d0b76 100644
--- a/truth.changes
+++ b/truth.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 26 15:13:50 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 0.24 to fix building of javadoc with
+  java 11
+
 -------------------------------------------------------------------
 Tue May  7 10:58:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/truth.spec b/truth.spec
index de9d411..d3ca1e6 100644
--- a/truth.spec
+++ b/truth.spec
@@ -17,13 +17,14 @@
 
 
 Name:           truth
-Version:        0.23
+Version:        0.24
 Release:        0
 Summary:        An assertion framework for Java unit tests
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://github.com/google/truth
 Source0:        %{name}-%{version}.tar.xz
+BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.auto.value:auto-value)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
@@ -31,7 +32,6 @@ BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
-Obsoletes:      %{name}-javadoc
 BuildArch:      noarch
 
 %description
@@ -39,6 +39,13 @@ Truth is a library provides alternative ways to express assertions in
 unit tests. It can be used as a replacement for JUnit's assertions or FEST
 or it can be used alongside where other approaches seem more suitable.
 
+%package        javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation/HTML
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
 %prep
 %setup -q
 %pom_remove_plugin :maven-gpg-plugin
@@ -51,15 +58,21 @@ or it can be used alongside where other approaches seem more suitable.
           </testExcludes>" core
 
 %build
-# javadoc build crashes javadoc 11
-%{mvn_build} -fj
+%{mvn_build} -f \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+	-- -Dmaven.compiler.release=6
+%endif
 
 %install
 %mvn_install
+%fdupes -s %{buildroot}%{_javadocdir}
 
 %files -f .mfiles
 %doc README.md
 %dir %{_javadir}/%{name}
 %license LICENSE
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE
+
 %changelog