Changed RPM Vendor name to be system default instead of "Raytheon"
This commit is contained in:
parent
845c878de6
commit
551925c84b
28 changed files with 35 additions and 40 deletions
|
@ -18,7 +18,7 @@ BuildRoot: %{_build_root}
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -20,7 +20,7 @@ BuildRoot: /tmp
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
@ -68,7 +68,6 @@ popd > /dev/null 2>&1
|
||||||
|
|
||||||
for dir in \
|
for dir in \
|
||||||
"${RPM_BUILD_ROOT}/awips2/cave" \
|
"${RPM_BUILD_ROOT}/awips2/cave" \
|
||||||
"${RPM_BUILD_ROOT}/etc/xdg/autostart" \
|
|
||||||
"${RPM_BUILD_ROOT}/etc/profile.d" \
|
"${RPM_BUILD_ROOT}/etc/profile.d" \
|
||||||
"${RPM_BUILD_ROOT}/usr/share/applications" \
|
"${RPM_BUILD_ROOT}/usr/share/applications" \
|
||||||
; do
|
; do
|
||||||
|
@ -103,14 +102,10 @@ if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# text-workstation autostart script.
|
# cave autostart script.
|
||||||
CAVE_SCRIPTS_DIR="%{_baseline_workspace}/rpms/%{_component_project_dir}/scripts"
|
CAVE_SCRIPTS_DIR="%{_baseline_workspace}/rpms/%{_component_project_dir}/scripts"
|
||||||
TEXTWS_AUTO_SCRIPT="${CAVE_SCRIPTS_DIR}/autostart/textws_left.desktop"
|
CAVE_AUTO_SCRIPT="${CAVE_SCRIPTS_DIR}/autostart/cave.desktop"
|
||||||
cp ${TEXTWS_AUTO_SCRIPT} ${RPM_BUILD_ROOT}/etc/xdg/autostart
|
cp ${CAVE_AUTO_SCRIPT} ${RPM_BUILD_ROOT}/usr/share/applications
|
||||||
if [ $? -ne 0 ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
cp ${TEXTWS_AUTO_SCRIPT} ${RPM_BUILD_ROOT}/usr/share/applications
|
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -175,8 +170,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||||
%defattr(644,root,root,-)
|
%defattr(644,root,root,-)
|
||||||
/etc/profile.d/awips2Cave.csh
|
/etc/profile.d/awips2Cave.csh
|
||||||
/etc/profile.d/awips2Cave.sh
|
/etc/profile.d/awips2Cave.sh
|
||||||
/etc/xdg/autostart/textws_left.desktop
|
/usr/share/applications/cave.desktop
|
||||||
/usr/share/applications/textws_left.desktop
|
|
||||||
|
|
||||||
%defattr(644,awips,fxalpha,755)
|
%defattr(644,awips,fxalpha,755)
|
||||||
/awips2/cave/*.ini
|
/awips2/cave/*.ini
|
||||||
|
@ -186,6 +180,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||||
%dir /awips2/cave/caveEnvironment
|
%dir /awips2/cave/caveEnvironment
|
||||||
/awips2/cave/caveEnvironment/*
|
/awips2/cave/caveEnvironment/*
|
||||||
/awips2/cave/*.sh
|
/awips2/cave/*.sh
|
||||||
|
/awips2/cave/cave.png
|
||||||
/awips2/cave/VizUpdater.jar
|
/awips2/cave/VizUpdater.jar
|
||||||
# not a noarch RPM due to the presence of the architecture-specific libraries.
|
# not a noarch RPM due to the presence of the architecture-specific libraries.
|
||||||
%dir /awips2/cave/lib64
|
%dir /awips2/cave/lib64
|
||||||
|
|
|
@ -29,7 +29,7 @@ BuildRoot: /tmp
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -11,7 +11,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -19,7 +19,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -17,7 +17,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -15,7 +15,7 @@ Prefix: %{_component_default_prefix}
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
@ -42,7 +42,7 @@ mkdir -p ${RPM_BUILD_ROOT}/awips2/fxa
|
||||||
%build
|
%build
|
||||||
|
|
||||||
%install
|
%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.
|
# current component.
|
||||||
function copyLegal()
|
function copyLegal()
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,7 +18,7 @@ BuildArch: %{_build_arch}
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -11,7 +11,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -11,7 +11,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -16,7 +16,7 @@ Prefix: %{_component_default_prefix}
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -12,7 +12,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -13,7 +13,7 @@ BuildRoot: /tmp
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -11,7 +11,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
Obsoletes: awips2-gfesuite-server
|
Obsoletes: awips2-gfesuite-server
|
||||||
|
|
|
@ -11,7 +11,7 @@ BuildArch: %{_build_arch}
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -11,7 +11,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -13,7 +13,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -14,7 +14,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -16,7 +16,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -8,7 +8,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -11,7 +11,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -23,7 +23,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
@ -90,7 +90,7 @@ function updateEDEXVersion()
|
||||||
echo "* AWIPS II EDEX ESB Platform *" \
|
echo "* AWIPS II EDEX ESB Platform *" \
|
||||||
>> ${EDEX_BANNER_TXT}
|
>> ${EDEX_BANNER_TXT}
|
||||||
padEdexBannerLine "Version: %{_component_version}-%{_component_release}" "${EDEX_BANNER_TXT}"
|
padEdexBannerLine "Version: %{_component_version}-%{_component_release}" "${EDEX_BANNER_TXT}"
|
||||||
echo "* Raytheon Company *" \
|
echo "* %{_build_vendor} Company *" \
|
||||||
>> ${EDEX_BANNER_TXT}
|
>> ${EDEX_BANNER_TXT}
|
||||||
echo "*------------------------------------------------*" \
|
echo "*------------------------------------------------*" \
|
||||||
>> ${EDEX_BANNER_TXT}
|
>> ${EDEX_BANNER_TXT}
|
||||||
|
|
|
@ -16,7 +16,7 @@ BuildRoot: %{_build_root}
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
#######################################################
|
#######################################################
|
||||||
|
|
|
@ -11,7 +11,7 @@ BuildRoot: %{_build_root}
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -11,7 +11,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -10,7 +10,7 @@ BuildRoot: %{_build_root}
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
Requires: awips2
|
Requires: awips2
|
||||||
Requires: awips2-python
|
Requires: awips2-python
|
||||||
|
|
|
@ -17,7 +17,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
|
@ -17,7 +17,7 @@ BuildArch: noarch
|
||||||
URL: N/A
|
URL: N/A
|
||||||
License: N/A
|
License: N/A
|
||||||
Distribution: N/A
|
Distribution: N/A
|
||||||
Vendor: Raytheon
|
Vendor: %{_build_vendor}
|
||||||
Packager: %{_build_site}
|
Packager: %{_build_site}
|
||||||
|
|
||||||
AutoReq: no
|
AutoReq: no
|
||||||
|
|
Loading…
Add table
Reference in a new issue