[java-1.8.0-openjdk] uniquejavadocdir changed to parametrised macro. All calls updated

[jiri vanek]

commit d206016bba6c55b7c3cf1f33a102faad628b05b4
Author: Jiri Vanek <jvanek at redhat.com>
Date:   Tue Nov 4 16:56:56 2014 +0100

    uniquejavadocdir changed to parametrised macro. All calls updated
    
    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)

 java-1.8.0-openjdk.spec |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 4c4b42d..ff010d9 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -127,10 +127,10 @@
 %global fullversion     %{name}-%{version}-%{release}
 #images stub
 %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
 %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.
 %global sdkdir()        %{expand:%{uniquesuffix %%1}}
@@ -380,13 +380,13 @@ exit 0
 
 %global post_javadoc() %{expand:
 alternatives \\
-  --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir}/api \\
+  --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{uniquejavadocdir %%1}/api \\
   %{priority}
 exit 0
 }
 
 %global postun_javadoc() %{expand:
-  alternatives --remove javadocdir %{_javadocdir}/%{uniquejavadocdir}/api
+  alternatives --remove javadocdir %{_javadocdir}/%{uniquejavadocdir %%1}/api
 exit 0
 }
 
@@ -501,7 +501,7 @@ exit 0
 
 %global files_javadoc() %{expand:
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{uniquejavadocdir}
+%doc %{_javadocdir}/%{uniquejavadocdir %%1}
 %doc %{buildoutputdir}/images/%{j2sdkimage %%1}/jre/LICENSE
 }
 
@@ -1295,7 +1295,7 @@ popd
 
 # Install Javadoc documentation.
 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.
 for s in 16 24 32 48 ; do