Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development

Former-commit-id: 2089732453 [formerly 1b071a6258127495f9f8c419abae65b27519cf6e]
Former-commit-id: db8cf0d35f
This commit is contained in:
Greg Armendariz 2013-05-23 09:10:41 -05:00 committed by Gerrit Code Review
commit 287f078150

View file

@ -3,6 +3,9 @@
%define _component_project_dir awips2.cave/Installer.cave %define _component_project_dir awips2.cave/Installer.cave
%define _component_zip_file_name CAVE-linux.gtk.%{_build_arch}.zip %define _component_zip_file_name CAVE-linux.gtk.%{_build_arch}.zip
%define _component_desc "awips2-cave" %define _component_desc "awips2-cave"
%define _swt_version 3.8.1.v3836b
%define _ui_version 3.8.2.v20121018-234953
# #
# awips2-cave Spec File # awips2-cave Spec File
# #
@ -188,34 +191,34 @@ pushd . > /dev/null 2>&1
cd /awips2/cave/plugins cd /awips2/cave/plugins
# Forcefully unzip: org.eclipse.swt.gtk.linux.x86_3.6.1.v3655c.jar # Forcefully unzip: org.eclipse.swt.gtk.linux.x86_3.6.1.v3655c.jar
# : if i386 # : if i386
if [ -f org.eclipse.swt.gtk.linux.x86_3.6.1.v3655c.jar ]; then if [ -f org.eclipse.swt.gtk.linux.x86_%{_swt_version}.jar ]; then
mkdir org.eclipse.swt.gtk.linux.x86_3.6.1.v3655c mkdir org.eclipse.swt.gtk.linux.x86_%{_swt_version}
unzip -qq org.eclipse.swt.gtk.linux.x86_3.6.1.v3655c.jar \ unzip -qq org.eclipse.swt.gtk.linux.x86_%{_swt_version}.jar \
-d org.eclipse.swt.gtk.linux.x86_3.6.1.v3655c -d org.eclipse.swt.gtk.linux.x86_%{_swt_version}
rm -f org.eclipse.swt.gtk.linux.x86_3.6.1.v3655c.jar rm -f org.eclipse.swt.gtk.linux.x86_%{_swt_version}.jar
mv org.eclipse.swt.gtk.linux.x86_3.6.1.v3655c \ mv org.eclipse.swt.gtk.linux.x86_%{_swt_version} \
org.eclipse.swt.gtk.linux.x86_3.6.1.v3655c.jar org.eclipse.swt.gtk.linux.x86_%{_swt_version}.jar
fi fi
# Forcefully unzip: org.eclipse.swt.gtk.linux.x86_64_3.6.1.v3655c.jar # Forcefully unzip: org.eclipse.swt.gtk.linux.x86_64_3.6.1.v3655c.jar
# : if x86_64 # : if x86_64
if [ -f org.eclipse.swt.gtk.linux.x86_64_3.6.1.v3655c.jar ]; then if [ -f org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar ]; then
mkdir org.eclipse.swt.gtk.linux.x86_64_3.6.1.v3655c mkdir org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}
unzip -qq org.eclipse.swt.gtk.linux.x86_64_3.6.1.v3655c.jar \ unzip -qq org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar \
-d org.eclipse.swt.gtk.linux.x86_64_3.6.1.v3655c -d org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}
rm -f org.eclipse.swt.gtk.linux.x86_64_3.6.1.v3655c.jar rm -f org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar
mv org.eclipse.swt.gtk.linux.x86_64_3.6.1.v3655c \ mv org.eclipse.swt.gtk.linux.x86_64_%{_swt_version} \
org.eclipse.swt.gtk.linux.x86_64_3.6.1.v3655c.jar org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar
fi fi
# Forcefully unzip: org.eclipse.ui_3.6.1.M20100826-1330.jar # Forcefully unzip: org.eclipse.ui_3.6.1.M20100826-1330.jar
# : for i386 & x86_64 # : for i386 & x86_64
if [ -f org.eclipse.ui_3.6.1.M20100826-1330.jar ]; then if [ -f org.eclipse.ui_%{_ui_version}.jar ]; then
mkdir org.eclipse.ui_3.6.1.M20100826-1330 mkdir org.eclipse.ui_%{_ui_version}
unzip -qq org.eclipse.ui_3.6.1.M20100826-1330.jar \ unzip -qq org.eclipse.ui_%{_ui_version}.jar \
-d org.eclipse.ui_3.6.1.M20100826-1330 -d org.eclipse.ui_%{_ui_version}
rm -f org.eclipse.ui_3.6.1.M20100826-1330.jar rm -f org.eclipse.ui_%{_ui_version}.jar
mv org.eclipse.ui_3.6.1.M20100826-1330 \ mv org.eclipse.ui_%{_ui_version} \
org.eclipse.ui_3.6.1.M20100826-1330.jar org.eclipse.ui_%{_ui_version}.jar
fi fi
popd > /dev/null 2>&1 popd > /dev/null 2>&1