rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

uniquejavadocdir changed to parametrised macro. All calls updated

Browse Source 
Without this, both debug and normal javadoc were going to same directory. Although build passed, rpmlint in result packages after run fails with ...S. failure "mischamsch" but it measn that fiels are going to same directory, but are not identical (differetn timestamp in our case)
This commit is contained in:
Jiri Vanek 2014-11-04 16:56:56 +01:00
parent 73bf527b6e
commit d206016bba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java-1.8.0-openjdk.spec
View File

@ -127,10 +127,10 @@
%global fullversion %{name}-%{version}-%{release} %global fullversion %{name}-%{version}-%{release}
#images stub #images stub
%global j2sdkimage() %{expand:j2sdk-image%1} %global j2sdkimage() %{expand:j2sdk-image%1}
#we can copy the javadoc to not arched dir, or made it not noarch
%global uniquejavadocdir() %{expand:%{fullversion}%1}
#main id and dir of this jdk #main id and dir of this jdk
%global uniquesuffix() %{expand:%{fullversion}.%{_arch}%1} %global uniquesuffix() %{expand:%{fullversion}.%{_arch}%1}
#we can copy the javadoc to not arched dir, or made it not noarch
%global uniquejavadocdir %{fullversion}
# Standard JPackage directories and symbolic links. # Standard JPackage directories and symbolic links.
%global sdkdir() %{expand:%{uniquesuffix %%1}} %global sdkdir() %{expand:%{uniquesuffix %%1}}
@ -380,13 +380,13 @@ exit 0
%global post_javadoc() %{expand: %global post_javadoc() %{expand:
alternatives \\ alternatives \\
--install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir}/api \\ --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir %%1}/api \\
%{priority} %{priority}
exit 0 exit 0
} }
%global postun_javadoc() %{expand: %global postun_javadoc() %{expand:
alternatives --remove javadocdir %{_javadocdir}/%{uniquejavadocdir}/api alternatives --remove javadocdir %{_javadocdir}/%{uniquejavadocdir %%1}/api
exit 0 exit 0
} }
@ -501,7 +501,7 @@ exit 0
%global files_javadoc() %{expand: %global files_javadoc() %{expand:
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc %{_javadocdir}/%{uniquejavadocdir} %doc %{_javadocdir}/%{uniquejavadocdir %%1}
%doc %{buildoutputdir}/images/%{j2sdkimage %%1}/jre/LICENSE %doc %{buildoutputdir}/images/%{j2sdkimage %%1}/jre/LICENSE
} }
@ -1295,7 +1295,7 @@ popd
# Install Javadoc documentation. # Install Javadoc documentation.
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir} cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir $suffix}
# Install icons and menu entries. # Install icons and menu entries.
for s in 16 24 32 48 ; do for s in 16 24 32 48 ; do