From 83c9dddd75852e130944993bb9f1779d39ba2d0d16eca0a5a0f8b180e2220e25 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 6 Dec 2018 12:25:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/beust-jcommander?expand=0&rev=4 --- beust-jcommander.changes | 5 +++++ beust-jcommander.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/beust-jcommander.changes b/beust-jcommander.changes index 09280df..196f6f8 100644 --- a/beust-jcommander.changes +++ b/beust-jcommander.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 6 12:25:36 UTC 2018 - Fridrich Strba + +- Fix javadoc build with older JDK versions + ------------------------------------------------------------------- Thu Oct 25 20:55:17 UTC 2018 - Fridrich Strba diff --git a/beust-jcommander.spec b/beust-jcommander.spec index 5940e31..037a8d4 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -62,14 +62,14 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml %build mkdir -p build/classes mkdir -p build/javadoc -javac -d build/classes -source 8 -target 8 `find src/main/java -name *.java | xargs` -javadoc -d build/javadoc -source 8 --source-path src/main/java/ `find src/main/java -name *.java | xargs` -(cd build/classes && jar cf ../%{name}-%{version}.jar `find . -name *.class | xargs`) +javac -d build/classes -source 8 -target 8 $(find src/main/java -name *.java | xargs) +javadoc -d build/javadoc -notimestamp -source 8 $(find src/main/java -name *.java | xargs) +jar cf %{name}-%{version}.jar -C build/classes . %install # jars install -d -m 0755 %{buildroot}%{_javadir} -install -m 644 build/%{name}-%{version}.jar \ +install -m 644 %{name}-%{version}.jar \ %{buildroot}%{_javadir}/%{name}-%{version}.jar (cd %{buildroot}%{_javadir} && ln -s %{name}-%{version}.jar %{name}.jar) (cd %{buildroot}%{_javadir} && ln -s %{name}-%{version}.jar %{short_name}-%{version}.jar)