From 551925c84b2b8376a27b9556cb67aa8dab948f19 Mon Sep 17 00:00:00 2001
From: ucar-tmeyer <tiffanym@ucar.edu>
Date: Mon, 23 Jan 2023 20:38:50 +0000
Subject: [PATCH] Changed RPM Vendor name to be system default instead of
 "Raytheon"

---
 .../Installer.alertviz/component.spec           |  2 +-
 .../Installer.cave-wrapper/component.spec       | 17 ++++++-----------
 rpms/awips2.cave/Installer.cave/component.spec  |  2 +-
 .../Installer.aviation/component.spec           |  2 +-
 rpms/awips2.core/Installer.awips/component.spec |  2 +-
 .../Installer.awips2-devel/component.spec       |  2 +-
 rpms/awips2.core/Installer.cli/component.spec   |  4 ++--
 .../Installer.common-base/component.spec        |  2 +-
 .../component.spec                              |  2 +-
 .../component.spec                              |  2 +-
 .../Installer.database/component.spec           |  2 +-
 .../edex/component.spec                         |  2 +-
 rpms/awips2.core/Installer.gfe/component.spec   |  2 +-
 .../Installer.gfesuite/component.spec           |  2 +-
 .../awips2.core/Installer.ignite/component.spec |  2 +-
 .../component.spec                              |  2 +-
 .../Installer.maps-database/component.spec      |  2 +-
 .../awips2.core/Installer.pypies/component.spec |  2 +-
 .../Installer.rehost-support/component.spec     |  2 +-
 .../Installer.scripts/component.spec            |  2 +-
 rpms/awips2.core/Installer.topo/component.spec  |  2 +-
 .../Installer.version/component.spec            |  4 ++--
 .../Installer.edex-component/component.spec     |  2 +-
 .../Installer.edex-configuration/component.spec |  2 +-
 .../Installer.edex-shapefiles/component.spec    |  2 +-
 rpms/awips2.edex/Installer.edex/component.spec  |  2 +-
 .../Installer.dynamicserialize/component.spec   |  2 +-
 .../Installer.ufpy/component.spec               |  2 +-
 28 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/rpms/awips2.cave/Installer.alertviz/component.spec b/rpms/awips2.cave/Installer.alertviz/component.spec
index e1aa4e30c4..17d01eb870 100644
--- a/rpms/awips2.cave/Installer.alertviz/component.spec
+++ b/rpms/awips2.cave/Installer.alertviz/component.spec
@@ -18,7 +18,7 @@ BuildRoot: %{_build_root}
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.cave/Installer.cave-wrapper/component.spec b/rpms/awips2.cave/Installer.cave-wrapper/component.spec
index 06401bc0e7..99abe386a4 100644
--- a/rpms/awips2.cave/Installer.cave-wrapper/component.spec
+++ b/rpms/awips2.cave/Installer.cave-wrapper/component.spec
@@ -20,7 +20,7 @@ BuildRoot: /tmp
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
@@ -68,7 +68,6 @@ popd > /dev/null 2>&1
 
 for dir in \
         "${RPM_BUILD_ROOT}/awips2/cave" \
-        "${RPM_BUILD_ROOT}/etc/xdg/autostart" \
         "${RPM_BUILD_ROOT}/etc/profile.d" \
         "${RPM_BUILD_ROOT}/usr/share/applications" \
         ; do
@@ -103,14 +102,10 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-# text-workstation autostart script.
+# cave autostart script.
 CAVE_SCRIPTS_DIR="%{_baseline_workspace}/rpms/%{_component_project_dir}/scripts"
-TEXTWS_AUTO_SCRIPT="${CAVE_SCRIPTS_DIR}/autostart/textws_left.desktop"
-cp ${TEXTWS_AUTO_SCRIPT} ${RPM_BUILD_ROOT}/etc/xdg/autostart
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-cp ${TEXTWS_AUTO_SCRIPT} ${RPM_BUILD_ROOT}/usr/share/applications
+CAVE_AUTO_SCRIPT="${CAVE_SCRIPTS_DIR}/autostart/cave.desktop"
+cp ${CAVE_AUTO_SCRIPT} ${RPM_BUILD_ROOT}/usr/share/applications
 if [ $? -ne 0 ]; then
    exit 1
 fi
@@ -175,8 +170,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(644,root,root,-)
 /etc/profile.d/awips2Cave.csh
 /etc/profile.d/awips2Cave.sh
-/etc/xdg/autostart/textws_left.desktop
-/usr/share/applications/textws_left.desktop
+/usr/share/applications/cave.desktop
 
 %defattr(644,awips,fxalpha,755)
 /awips2/cave/*.ini
@@ -186,6 +180,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir /awips2/cave/caveEnvironment
 /awips2/cave/caveEnvironment/*
 /awips2/cave/*.sh
+/awips2/cave/cave.png
 /awips2/cave/VizUpdater.jar
 # not a noarch RPM due to the presence of the architecture-specific libraries.
 %dir /awips2/cave/lib64
diff --git a/rpms/awips2.cave/Installer.cave/component.spec b/rpms/awips2.cave/Installer.cave/component.spec
index 599d178fd7..591063b131 100644
--- a/rpms/awips2.cave/Installer.cave/component.spec
+++ b/rpms/awips2.cave/Installer.cave/component.spec
@@ -29,7 +29,7 @@ BuildRoot: /tmp
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.aviation/component.spec b/rpms/awips2.core/Installer.aviation/component.spec
index 6b70c75393..534a40e05a 100644
--- a/rpms/awips2.core/Installer.aviation/component.spec
+++ b/rpms/awips2.core/Installer.aviation/component.spec
@@ -11,7 +11,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.awips/component.spec b/rpms/awips2.core/Installer.awips/component.spec
index 9ee75972a6..14c03a05cc 100644
--- a/rpms/awips2.core/Installer.awips/component.spec
+++ b/rpms/awips2.core/Installer.awips/component.spec
@@ -19,7 +19,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.awips2-devel/component.spec b/rpms/awips2.core/Installer.awips2-devel/component.spec
index 0dd0c057cd..03c6fb65bb 100644
--- a/rpms/awips2.core/Installer.awips2-devel/component.spec
+++ b/rpms/awips2.core/Installer.awips2-devel/component.spec
@@ -17,7 +17,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.cli/component.spec b/rpms/awips2.core/Installer.cli/component.spec
index fb7391e0e1..b0889263e3 100644
--- a/rpms/awips2.core/Installer.cli/component.spec
+++ b/rpms/awips2.core/Installer.cli/component.spec
@@ -15,7 +15,7 @@ Prefix: %{_component_default_prefix}
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
@@ -42,7 +42,7 @@ mkdir -p ${RPM_BUILD_ROOT}/awips2/fxa
 %build
 
 %install
-# Copies the standard Raytheon licenses into a license directory for the
+# Copies the standard %{_build_vendor} licenses into a license directory for the
 # current component.
 function copyLegal()
 {
diff --git a/rpms/awips2.core/Installer.common-base/component.spec b/rpms/awips2.core/Installer.common-base/component.spec
index f8d5552751..ee8aaceed2 100644
--- a/rpms/awips2.core/Installer.common-base/component.spec
+++ b/rpms/awips2.core/Installer.common-base/component.spec
@@ -18,7 +18,7 @@ BuildArch: %{_build_arch}
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.database-server-configuration/component.spec b/rpms/awips2.core/Installer.database-server-configuration/component.spec
index 25fae521e2..67134f6aee 100644
--- a/rpms/awips2.core/Installer.database-server-configuration/component.spec
+++ b/rpms/awips2.core/Installer.database-server-configuration/component.spec
@@ -11,7 +11,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.database-standalone-configuration/component.spec b/rpms/awips2.core/Installer.database-standalone-configuration/component.spec
index 72284b8201..d8551f3cee 100644
--- a/rpms/awips2.core/Installer.database-standalone-configuration/component.spec
+++ b/rpms/awips2.core/Installer.database-standalone-configuration/component.spec
@@ -11,7 +11,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.database/component.spec b/rpms/awips2.core/Installer.database/component.spec
index 376a3136f3..5d021bf49c 100644
--- a/rpms/awips2.core/Installer.database/component.spec
+++ b/rpms/awips2.core/Installer.database/component.spec
@@ -16,7 +16,7 @@ Prefix: %{_component_default_prefix}
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.edex-environment/edex/component.spec b/rpms/awips2.core/Installer.edex-environment/edex/component.spec
index cb647c0dc5..906d55b511 100644
--- a/rpms/awips2.core/Installer.edex-environment/edex/component.spec
+++ b/rpms/awips2.core/Installer.edex-environment/edex/component.spec
@@ -12,7 +12,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.gfe/component.spec b/rpms/awips2.core/Installer.gfe/component.spec
index 953c762e2f..ab91158d9f 100644
--- a/rpms/awips2.core/Installer.gfe/component.spec
+++ b/rpms/awips2.core/Installer.gfe/component.spec
@@ -13,7 +13,7 @@ BuildRoot: /tmp
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.gfesuite/component.spec b/rpms/awips2.core/Installer.gfesuite/component.spec
index 6478f6ce1b..3064f03f8d 100644
--- a/rpms/awips2.core/Installer.gfesuite/component.spec
+++ b/rpms/awips2.core/Installer.gfesuite/component.spec
@@ -11,7 +11,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 Obsoletes: awips2-gfesuite-server
diff --git a/rpms/awips2.core/Installer.ignite/component.spec b/rpms/awips2.core/Installer.ignite/component.spec
index dbda9cf236..b58ae18f36 100644
--- a/rpms/awips2.core/Installer.ignite/component.spec
+++ b/rpms/awips2.core/Installer.ignite/component.spec
@@ -11,7 +11,7 @@ BuildArch: %{_build_arch}
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.localapps-environment/component.spec b/rpms/awips2.core/Installer.localapps-environment/component.spec
index 35ad882662..ff0579b84a 100644
--- a/rpms/awips2.core/Installer.localapps-environment/component.spec
+++ b/rpms/awips2.core/Installer.localapps-environment/component.spec
@@ -11,7 +11,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.maps-database/component.spec b/rpms/awips2.core/Installer.maps-database/component.spec
index ee2aa265d9..e4b01fc6ff 100644
--- a/rpms/awips2.core/Installer.maps-database/component.spec
+++ b/rpms/awips2.core/Installer.maps-database/component.spec
@@ -13,7 +13,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.pypies/component.spec b/rpms/awips2.core/Installer.pypies/component.spec
index 0c21e9ad25..d80af3643d 100644
--- a/rpms/awips2.core/Installer.pypies/component.spec
+++ b/rpms/awips2.core/Installer.pypies/component.spec
@@ -14,7 +14,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.rehost-support/component.spec b/rpms/awips2.core/Installer.rehost-support/component.spec
index 520559ecfa..fbf7ad7248 100644
--- a/rpms/awips2.core/Installer.rehost-support/component.spec
+++ b/rpms/awips2.core/Installer.rehost-support/component.spec
@@ -16,7 +16,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.scripts/component.spec b/rpms/awips2.core/Installer.scripts/component.spec
index 4f7aa8b0c0..0ef740d0a3 100644
--- a/rpms/awips2.core/Installer.scripts/component.spec
+++ b/rpms/awips2.core/Installer.scripts/component.spec
@@ -8,7 +8,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.topo/component.spec b/rpms/awips2.core/Installer.topo/component.spec
index 63c067c31c..325c4088ba 100644
--- a/rpms/awips2.core/Installer.topo/component.spec
+++ b/rpms/awips2.core/Installer.topo/component.spec
@@ -11,7 +11,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.core/Installer.version/component.spec b/rpms/awips2.core/Installer.version/component.spec
index c9b271693d..f535e2d514 100644
--- a/rpms/awips2.core/Installer.version/component.spec
+++ b/rpms/awips2.core/Installer.version/component.spec
@@ -23,7 +23,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
@@ -90,7 +90,7 @@ function updateEDEXVersion()
    echo "* AWIPS II EDEX ESB Platform                     *" \
       >> ${EDEX_BANNER_TXT}
    padEdexBannerLine "Version: %{_component_version}-%{_component_release}" "${EDEX_BANNER_TXT}"
-   echo "* Raytheon Company                               *" \
+   echo "* %{_build_vendor} Company                               *" \
       >> ${EDEX_BANNER_TXT}
    echo "*------------------------------------------------*" \
       >> ${EDEX_BANNER_TXT}
diff --git a/rpms/awips2.edex/Installer.edex-component/component.spec b/rpms/awips2.edex/Installer.edex-component/component.spec
index 8257302988..551abd03e5 100644
--- a/rpms/awips2.edex/Installer.edex-component/component.spec
+++ b/rpms/awips2.edex/Installer.edex-component/component.spec
@@ -16,7 +16,7 @@ BuildRoot: %{_build_root}
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 #######################################################
diff --git a/rpms/awips2.edex/Installer.edex-configuration/component.spec b/rpms/awips2.edex/Installer.edex-configuration/component.spec
index 1cb0f0e7d6..e6390449b7 100644
--- a/rpms/awips2.edex/Installer.edex-configuration/component.spec
+++ b/rpms/awips2.edex/Installer.edex-configuration/component.spec
@@ -11,7 +11,7 @@ BuildRoot: %{_build_root}
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.edex/Installer.edex-shapefiles/component.spec b/rpms/awips2.edex/Installer.edex-shapefiles/component.spec
index c6455bd554..700254c1ae 100644
--- a/rpms/awips2.edex/Installer.edex-shapefiles/component.spec
+++ b/rpms/awips2.edex/Installer.edex-shapefiles/component.spec
@@ -11,7 +11,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/awips2.edex/Installer.edex/component.spec b/rpms/awips2.edex/Installer.edex/component.spec
index c7631c55bb..0dc9f71be6 100644
--- a/rpms/awips2.edex/Installer.edex/component.spec
+++ b/rpms/awips2.edex/Installer.edex/component.spec
@@ -10,7 +10,7 @@ BuildRoot: %{_build_root}
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 Requires: awips2
 Requires: awips2-python
diff --git a/rpms/python.site-packages/Installer.dynamicserialize/component.spec b/rpms/python.site-packages/Installer.dynamicserialize/component.spec
index b2125d7119..cb28c407af 100644
--- a/rpms/python.site-packages/Installer.dynamicserialize/component.spec
+++ b/rpms/python.site-packages/Installer.dynamicserialize/component.spec
@@ -17,7 +17,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no
diff --git a/rpms/python.site-packages/Installer.ufpy/component.spec b/rpms/python.site-packages/Installer.ufpy/component.spec
index 60d5de412b..da54a180ac 100644
--- a/rpms/python.site-packages/Installer.ufpy/component.spec
+++ b/rpms/python.site-packages/Installer.ufpy/component.spec
@@ -17,7 +17,7 @@ BuildArch: noarch
 URL: N/A
 License: N/A
 Distribution: N/A
-Vendor: Raytheon
+Vendor: %{_build_vendor}
 Packager: %{_build_site}
 
 AutoReq: no