tweak for name changes

f41
Caolán McNamara 14 years ago
parent 0af7dd3853
commit 1b07a3aa0d

@ -797,7 +797,7 @@ if dmake openoffice_en-US; then
break break
else else
echo - ---dump log start--- echo - ---dump log start---
cat ../unx*.pro/OpenOffice/installed/logging/en-US/log_*_en-US.log cat ../unx*.pro/LibreOffice/installed/logging/en-US/log_*_en-US.log
echo - ---dump log end--- echo - ---dump log end---
ok=false ok=false
fi fi
@ -805,12 +805,12 @@ if [ $ok == "false" ]; then
exit 1 exit 1
fi fi
mkdir -p $RPM_BUILD_ROOT/%{baseinstdir} mkdir -p $RPM_BUILD_ROOT/%{baseinstdir}
mv ../unxlng*.pro/OpenOffice/installed/install/en-US/* $RPM_BUILD_ROOT/%{baseinstdir} mv ../unxlng*.pro/LibreOffice/installed/install/en-US/* $RPM_BUILD_ROOT/%{baseinstdir}
chmod -R +w $RPM_BUILD_ROOT/%{baseinstdir} chmod -R +w $RPM_BUILD_ROOT/%{baseinstdir}
%if %{langpacks} %if %{langpacks}
dmake ooolanguagepack dmake ooolanguagepack
rm -rf ../unxlng*.pro/OpenOffice_languagepack/installed/install/log rm -rf ../unxlng*.pro/LibreOffice_languagepack/installed/install/log
for langpack in ../unxlng*.pro/OpenOffice_languagepack/installed/install/*; do for langpack in ../unxlng*.pro/LibreOffice_languagepack/installed/install/*; do
cp -rp $langpack/* $RPM_BUILD_ROOT/%{baseinstdir} cp -rp $langpack/* $RPM_BUILD_ROOT/%{baseinstdir}
rm -rf $langpack rm -rf $langpack
done done
@ -823,7 +823,7 @@ rm -rf $RPM_BUILD_ROOT/%{baseinstdir}/share/prereg
$RPM_BUILD_ROOT/%{baseinstdir}/program/unopkg list --bundled || : $RPM_BUILD_ROOT/%{baseinstdir}/program/unopkg list --bundled || :
export WITH_LANG="en-US" export WITH_LANG="en-US"
dmake sdkoo dmake sdkoo
mv ../unxlng*.pro/OpenOffice_SDK/installed/install/en-US/*/sdk $RPM_BUILD_ROOT/%{sdkinstdir} mv ../unxlng*.pro/LibreOffice_SDK/installed/install/en-US/*/sdk $RPM_BUILD_ROOT/%{sdkinstdir}
cd ../../ cd ../../
# revoke ScriptProviders and make into extensions # revoke ScriptProviders and make into extensions

Loading…
Cancel
Save