diff --git a/rpms/awips2.cave/Installer.cave-wrapper/component.spec b/rpms/awips2.cave/Installer.cave-wrapper/component.spec index ec4078971a..7252e26d7c 100644 --- a/rpms/awips2.cave/Installer.cave-wrapper/component.spec +++ b/rpms/awips2.cave/Installer.cave-wrapper/component.spec @@ -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 applications 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}/applications/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,8 +180,9 @@ 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 /awips2/cave/lib64/* - diff --git a/rpms/awips2.cave/Installer.cave-wrapper/scripts/applications/cave.desktop b/rpms/awips2.cave/Installer.cave-wrapper/scripts/applications/cave.desktop new file mode 100644 index 0000000000..1317b916fc --- /dev/null +++ b/rpms/awips2.cave/Installer.cave-wrapper/scripts/applications/cave.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Version=1.0 +Name=AWIPS CAVE +Comment=Unidata AWIPS CAVE Visualization Client +Icon=/awips2/cave/cave.png +Exec=/awips2/cave/cave.sh +Categories=Network;WebBrowser +X-Desktop-File-Install-Version=0.15 diff --git a/rpms/awips2.cave/Installer.cave-wrapper/scripts/autostart/textws_left.desktop b/rpms/awips2.cave/Installer.cave-wrapper/scripts/autostart/textws_left.desktop deleted file mode 100644 index 25317c9cac..0000000000 --- a/rpms/awips2.cave/Installer.cave-wrapper/scripts/autostart/textws_left.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Terminal=false -Name=Launch TextWS left monitor -Icon=/awips/fxa/data/awips.gif -Name[en_US]=Launch TextWS left monitor -Icon[en_US]=/awips/fxa/data/awips.gif -Exec=/awips2/cave/textWS.sh -monitor 1