diff --git a/rpms/awips2.cave/Installer.alertviz/component.spec b/rpms/awips2.cave/Installer.alertviz/component.spec index 2311259687..78227a46c5 100644 --- a/rpms/awips2.cave/Installer.alertviz/component.spec +++ b/rpms/awips2.cave/Installer.alertviz/component.spec @@ -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/* diff --git a/rpms/awips2.core/Installer.ant/component.spec b/rpms/awips2.core/Installer.ant/component.spec index 5ad20d89f7..13331c38bb 100644 --- a/rpms/awips2.core/Installer.ant/component.spec +++ b/rpms/awips2.core/Installer.ant/component.spec @@ -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 diff --git a/rpms/awips2.core/Installer.cli/component.spec b/rpms/awips2.core/Installer.cli/component.spec index cae46deec9..c724304c9f 100644 --- a/rpms/awips2.core/Installer.cli/component.spec +++ b/rpms/awips2.core/Installer.cli/component.spec @@ -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 diff --git a/rpms/awips2.core/Installer.gfe.climo/component.spec b/rpms/awips2.core/Installer.gfe.climo/component.spec index f507d83538..a3919788d5 100644 --- a/rpms/awips2.core/Installer.gfe.climo/component.spec +++ b/rpms/awips2.core/Installer.gfe.climo/component.spec @@ -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 diff --git a/rpms/awips2.core/Installer.irt/component.spec b/rpms/awips2.core/Installer.irt/component.spec index 9a4ad2a415..345c6522a7 100644 --- a/rpms/awips2.core/Installer.irt/component.spec +++ b/rpms/awips2.core/Installer.irt/component.spec @@ -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 \ No newline at end of file +%files -f component-files.txt diff --git a/rpms/awips2.core/Installer.notification/component.spec b/rpms/awips2.core/Installer.notification/component.spec index e18ab79144..f8e4a456af 100644 --- a/rpms/awips2.core/Installer.notification/component.spec +++ b/rpms/awips2.core/Installer.notification/component.spec @@ -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 diff --git a/rpms/awips2.core/Installer.pgadmin/component.spec b/rpms/awips2.core/Installer.pgadmin/component.spec index bfaa988aae..562b81ab40 100644 --- a/rpms/awips2.core/Installer.pgadmin/component.spec +++ b/rpms/awips2.core/Installer.pgadmin/component.spec @@ -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 diff --git a/rpms/awips2.core/Installer.postgres/component.spec b/rpms/awips2.core/Installer.postgres/component.spec index 6e5b1895ab..84df1af755 100644 --- a/rpms/awips2.core/Installer.postgres/component.spec +++ b/rpms/awips2.core/Installer.postgres/component.spec @@ -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 diff --git a/rpms/awips2.core/Installer.python/component.spec b/rpms/awips2.core/Installer.python/component.spec index bb782c87f7..f48d1fbfd9 100644 --- a/rpms/awips2.core/Installer.python/component.spec +++ b/rpms/awips2.core/Installer.python/component.spec @@ -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 diff --git a/rpms/awips2.core/Installer.python/component.spec.tkinter b/rpms/awips2.core/Installer.python/component.spec.tkinter index 2194e255eb..8eec5e5024 100644 --- a/rpms/awips2.core/Installer.python/component.spec.tkinter +++ b/rpms/awips2.core/Installer.python/component.spec.tkinter @@ -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 diff --git a/rpms/awips2.core/Installer.rcm/component.spec b/rpms/awips2.core/Installer.rcm/component.spec index 4a68225fc3..ead8f3b602 100644 --- a/rpms/awips2.core/Installer.rcm/component.spec +++ b/rpms/awips2.core/Installer.rcm/component.spec @@ -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 diff --git a/rpms/awips2.core/Installer.tools/component.spec b/rpms/awips2.core/Installer.tools/component.spec index 860efdeac3..b3d5e007f3 100644 --- a/rpms/awips2.core/Installer.tools/component.spec +++ b/rpms/awips2.core/Installer.tools/component.spec @@ -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 diff --git a/rpms/awips2.core/Installer.topo/component.spec b/rpms/awips2.core/Installer.topo/component.spec index ff541c3e5b..3d980814d5 100644 --- a/rpms/awips2.core/Installer.topo/component.spec +++ b/rpms/awips2.core/Installer.topo/component.spec @@ -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