diff --git a/ws-jaxme.changes b/ws-jaxme.changes index 916198f..4375974 100644 --- a/ws-jaxme.changes +++ b/ws-jaxme.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 11 14:06:18 UTC 2014 - tchvatal@suse.com + +- Do not version javadoc dir. + ------------------------------------------------------------------- Tue Jul 8 10:34:11 UTC 2014 - tchvatal@suse.com diff --git a/ws-jaxme.spec b/ws-jaxme.spec index 68d22b9..6814ae5 100644 --- a/ws-jaxme.spec +++ b/ws-jaxme.spec @@ -132,12 +132,11 @@ done (cd %{buildroot}%{_javadir}/%{base_name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) (cd %{buildroot}%{_javadir}/%{base_name} && for jar in ws-*.jar; do ln -sf ${jar} `echo $jar| sed "s|ws-||g"`; done) #javadoc -install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -pr build/docs/src/documentation/content/apidocs %{buildroot}%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink +install -dm 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr build/docs/src/documentation/content/apidocs %{buildroot}%{_javadocdir}/%{name} #manual -install -dm 755 %{buildroot}%{_docdir}/%{name}-%{version} -cp -pr build/docs/src/documentation/content/manual %{buildroot}%{_docdir}/%{name}-%{version} +install -dm 755 %{buildroot}%{_docdir}/%{name} +cp -pr build/docs/src/documentation/content/manual %{buildroot}%{_docdir}/%{name} %files %defattr(0644,root,root,0755) @@ -146,11 +145,10 @@ cp -pr build/docs/src/documentation/content/manual %{buildroot}%{_docdir}/%{name %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files manual %defattr(0644,root,root,0755) -%doc %{_docdir}/%{name}-%{version} +%doc %{_docdir}/%{name} %changelog