ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868 Former-commit-id: e29cf5a57591e5a25b6e73b267c0abb46e9f95c2
This commit is contained in:
parent
92204e05a1
commit
3b4b9d262a
13 changed files with 15 additions and 47 deletions
|
@ -100,13 +100,8 @@ script_="%{_baseline_workspace}/build/static/linux/cave/awips2VisualizeUtility.s
|
|||
|
||||
# add the license information.
|
||||
license_dir="%{_baseline_workspace}/rpms/legal"
|
||||
cp "${license_dir}/license.txt" \
|
||||
%{_build_root}/awips2/alertviz
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cp "${license_dir}/Master Rights File.pdf" \
|
||||
cp "${license_dir}/Master_Rights_File.pdf" \
|
||||
%{_build_root}/awips2/alertviz
|
||||
if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
|
@ -140,7 +135,6 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
%dir /awips2/alertviz/features
|
||||
/awips2/alertviz/features/*
|
||||
%doc /awips2/alertviz/*.pdf
|
||||
%doc /awips2/alertviz/license.txt
|
||||
%dir /awips2/alertviz/plugins
|
||||
/awips2/alertviz/plugins/*
|
||||
|
||||
|
|
|
@ -51,9 +51,7 @@ function copyLegal()
|
|||
tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_baseline_workspace}/rpms/legal/FOSS_licenses/
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
%{_build_root}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
%{_build_root}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_build_root}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
|
|
@ -56,9 +56,7 @@ function copyLegal()
|
|||
tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_baseline_workspace}/rpms/legal/FOSS_licenses/
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
|
|
@ -53,9 +53,7 @@ function copyLegal()
|
|||
tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_baseline_workspace}/rpms/legal/FOSS_licenses/
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
|
|
@ -52,16 +52,12 @@ function copyLegal()
|
|||
tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_baseline_workspace}/rpms/legal/FOSS_licenses/
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
||||
echo "\"/${COMPONENT_BUILD_DIR}/licenses/license.txt\"" \
|
||||
>> %{_topdir}/BUILD/component-files.txt
|
||||
echo "\"/${COMPONENT_BUILD_DIR}/licenses/Master Rights File.pdf\"" \
|
||||
echo "\"/${COMPONENT_BUILD_DIR}/licenses/Master_Rights_File.pdf\"" \
|
||||
>> %{_topdir}/BUILD/component-files.txt
|
||||
echo "\"/${COMPONENT_BUILD_DIR}/licenses/FOSS_licenses.tar\"" \
|
||||
>> %{_topdir}/BUILD/component-files.txt
|
||||
|
@ -129,4 +125,4 @@ echo -e "\e[1;34m\| The AWIPS II IRT Installation Has Been Successfully Removed\
|
|||
echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
|
||||
echo ""
|
||||
|
||||
%files -f component-files.txt
|
||||
%files -f component-files.txt
|
||||
|
|
|
@ -74,9 +74,7 @@ function copyLegal()
|
|||
tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_baseline_workspace}/rpms/legal/FOSS_licenses/
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
|
|
@ -100,9 +100,7 @@ function copyLegal()
|
|||
tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_baseline_workspace}/rpms/legal/FOSS_licenses/
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
|
|
@ -104,9 +104,7 @@ function copyLegal()
|
|||
tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_baseline_workspace}/rpms/legal/FOSS_licenses/
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
|
|
@ -99,9 +99,7 @@ function copyLegal()
|
|||
|
||||
mkdir -p %{_build_root}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
%{_build_root}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
%{_build_root}/${COMPONENT_BUILD_DIR}/licenses
|
||||
}
|
||||
pushd . > /dev/null
|
||||
|
|
|
@ -101,9 +101,7 @@ function copyLegal()
|
|||
|
||||
mkdir -p %{_build_root}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
%{_build_root}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
%{_build_root}/${COMPONENT_BUILD_DIR}/licenses
|
||||
}
|
||||
pushd . > /dev/null
|
||||
|
|
|
@ -64,9 +64,7 @@ function copyLegal()
|
|||
tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_baseline_workspace}/rpms/legal/FOSS_licenses/
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
|
|
@ -139,9 +139,7 @@ function copyLegal()
|
|||
tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_baseline_workspace}/rpms/legal/FOSS_licenses/
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
|
|
@ -52,9 +52,7 @@ function copyLegal()
|
|||
tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
%{_baseline_workspace}/rpms/legal/FOSS_licenses/
|
||||
|
||||
cp %{_baseline_workspace}/rpms/legal/license.txt \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master Rights File.pdf" \
|
||||
cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
|
||||
${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
|
||||
|
|
Loading…
Add table
Reference in a new issue