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

Duplicating docs build. Trying to woarkaround koji rpmdiff S.5.... mismatch POSTUN

Browse Source
This commit is contained in:
Jiri 2014-11-05 08:51:05 +01:00
parent d206016bba
commit 97dad04f69
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java-1.8.0-openjdk.spec
View File

@ -1171,16 +1171,20 @@ pushd %{buildoutputdir}
if [ "$suffix" = "%{debug_suffix}" ] ; then if [ "$suffix" = "%{debug_suffix}" ] ; then
# debug build passed, mv it to j2sdk-image-%%{debug_suffix} # debug build passed, mv it to j2sdk-image-%%{debug_suffix}
mv images/%{j2sdkimage ""} images/%{j2sdkimage %{debug_suffix_unquoted}} mv images/%{j2sdkimage ""} images/%{j2sdkimage %{debug_suffix_unquoted}}
# same with docs
mv docs docs$suffix
fi fi
if [ %{include_normal_build} -eq 1 -a %{include_debug_build} -eq 1 ] ; then if [ %{include_normal_build} -eq 1 -a %{include_debug_build} -eq 1 ] ; then
if [ "$suffix" = "%{normal_suffix}" ] ; then if [ "$suffix" = "%{normal_suffix}" ] ; then
# normal build just passed, and debug one is going to run # normal build just passed, and debug one is going to run. backup image and docs
mv images/%{j2sdkimage ""} $normalBuildStore mv images/%{j2sdkimage ""} $normalBuildStore
mv docs $normalBuildStore
make clean make clean
fi fi
if [ "$suffix" = "%{debug_suffix}" ] ; then if [ "$suffix" = "%{debug_suffix}" ] ; then
# debug build just passed, restore normal one (see that debug one already renamed) # debug build just passed, restore normal backups (see that debug one already renamed)
mv $normalBuildStore/%{j2sdkimage ""} images/ mv $normalBuildStore/%{j2sdkimage ""} images/
mv $normalBuildStore/docs images/
fi fi
fi fi
popd popd
@ -1295,7 +1299,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 $suffix} cp -a %{buildoutputdir}/docs$suffix $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