Fridrich Strba 2018-12-06 12:25:57 +00:00 committed by Git OBS Bridge
parent efd85d25cb
commit 83c9dddd75
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Dec 6 12:25:36 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Fix javadoc build with older JDK versions
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 25 20:55:17 UTC 2018 - Fridrich Strba <fstrba@suse.com> Thu Oct 25 20:55:17 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -62,14 +62,14 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml
%build %build
mkdir -p build/classes mkdir -p build/classes
mkdir -p build/javadoc mkdir -p build/javadoc
javac -d build/classes -source 8 -target 8 `find src/main/java -name *.java | xargs` 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` javadoc -d build/javadoc -notimestamp -source 8 $(find src/main/java -name *.java | xargs)
(cd build/classes && jar cf ../%{name}-%{version}.jar `find . -name *.class | xargs`) jar cf %{name}-%{version}.jar -C build/classes .
%install %install
# jars # jars
install -d -m 0755 %{buildroot}%{_javadir} install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 build/%{name}-%{version}.jar \ install -m 644 %{name}-%{version}.jar \
%{buildroot}%{_javadir}/%{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 %{name}.jar)
(cd %{buildroot}%{_javadir} && ln -s %{name}-%{version}.jar %{short_name}-%{version}.jar) (cd %{buildroot}%{_javadir} && ln -s %{name}-%{version}.jar %{short_name}-%{version}.jar)