diff --git a/adaptx.changes b/adaptx.changes index 2d1ab45..757f77e 100644 --- a/adaptx.changes +++ b/adaptx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 11 13:49:39 UTC 2014 - tchvatal@suse.com + +- Do not version java docdir. + ------------------------------------------------------------------- Mon Jul 7 13:26:36 UTC 2014 - tchvatal@suse.com diff --git a/adaptx.spec b/adaptx.spec index e68bf28..d30de99 100644 --- a/adaptx.spec +++ b/adaptx.spec @@ -84,8 +84,8 @@ install -d -m 755 %{buildroot}%{_javadir} install -m 644 dist/%{name}_%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done) # javadoc -install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -pr build/doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr build/doc/javadoc/* %{buildroot}%{_javadocdir}/%{name} rm -rf build/doc/javadoc %files @@ -95,7 +95,7 @@ rm -rf build/doc/javadoc %files javadoc %defattr(0664,root,root,0755) -%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} %files doc %defattr(0664,root,root,0755)