2013-01-23 11:18:44 -05:00
|
|
|
diff -crB a/component.spec b/component.spec
|
2013-09-03 13:46:19 -05:00
|
|
|
*** a/component.spec 2013-09-03 10:51:59.952913214 -0500
|
|
|
|
--- b/component.spec 2013-09-03 11:10:40.703226553 -0500
|
2013-01-23 11:18:44 -05:00
|
|
|
***************
|
2013-09-03 13:46:19 -05:00
|
|
|
*** 6,13 ****
|
2013-01-23 11:18:44 -05:00
|
|
|
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
|
|
|
|
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
|
|
|
|
|
|
|
|
! Name: awips2-%{_component_name}
|
|
|
|
! Summary: awips2-%{_component_name} Installation
|
|
|
|
Version: %{_component_version}
|
|
|
|
Release: %{_component_release}
|
|
|
|
Group: AWIPSII
|
2013-09-03 13:46:19 -05:00
|
|
|
--- 6,13 ----
|
2013-01-23 11:18:44 -05:00
|
|
|
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
|
|
|
|
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
|
|
|
|
|
|
|
|
! Name: awips2-edex-datadelivery
|
|
|
|
! Summary: awips2-edex-datadelivery Installation
|
|
|
|
Version: %{_component_version}
|
|
|
|
Release: %{_component_release}
|
|
|
|
Group: AWIPSII
|
|
|
|
***************
|
|
|
|
*** 18,24 ****
|
|
|
|
Vendor: Raytheon
|
|
|
|
Packager: Bryan Kowal
|
|
|
|
|
|
|
|
! provides: awips2-%{_component_name}
|
|
|
|
requires: awips2
|
|
|
|
requires: awips2-edex-base
|
|
|
|
requires: awips2-python
|
|
|
|
--- 18,24 ----
|
|
|
|
Vendor: Raytheon
|
|
|
|
Packager: Bryan Kowal
|
|
|
|
|
|
|
|
! provides: awips2-edex-datadelivery
|
|
|
|
requires: awips2
|
|
|
|
requires: awips2-edex-base
|
|
|
|
requires: awips2-python
|
|
|
|
***************
|
2013-08-07 11:31:07 -05:00
|
|
|
*** 47,62 ****
|
|
|
|
if [ $? -ne 0 ]; then
|
|
|
|
exit 1
|
2013-01-23 11:18:44 -05:00
|
|
|
fi
|
|
|
|
|
|
|
|
! unzip %{_baseline_workspace}/build.edex/edex/dist/%{_component_name}.zip \
|
|
|
|
-d %{_build_root}
|
|
|
|
if [ $? -ne 0 ]; then
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
%pre
|
|
|
|
%post
|
|
|
|
%preun
|
|
|
|
%postun
|
|
|
|
|
2013-08-07 11:31:07 -05:00
|
|
|
%clean
|
2013-09-03 13:46:19 -05:00
|
|
|
--- 47,104 ----
|
2013-08-07 11:31:07 -05:00
|
|
|
if [ $? -ne 0 ]; then
|
|
|
|
exit 1
|
2013-01-23 11:18:44 -05:00
|
|
|
fi
|
|
|
|
+ # prepare the init.d directory path
|
|
|
|
+ mkdir -p %{_build_root}/etc/init.d
|
|
|
|
+ if [ $? -ne 0 ]; then
|
|
|
|
+ exit 1
|
|
|
|
+ fi
|
|
|
|
|
|
|
|
! unzip %{_baseline_workspace}/build.edex/edex/dist/edex-datadelivery.zip \
|
|
|
|
-d %{_build_root}
|
|
|
|
if [ $? -ne 0 ]; then
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
+ # include the init.d script
|
|
|
|
+ INSTALLER_RPM="%{_baseline_workspace}/rpms"
|
|
|
|
+ EDEX_DATADELIVERY="${INSTALLER_RPM}/awips2.edex/Installer.edex-datadelivery"
|
|
|
|
+ cp -v ${EDEX_DATADELIVERY}/scripts/init.d/* \
|
|
|
|
+ %{_build_root}/etc/init.d
|
|
|
|
+ if [ $? -ne 0 ]; then
|
|
|
|
+ exit 1
|
|
|
|
+ fi
|
|
|
|
+ # rename the script to prevent naming conflicts during installation
|
|
|
|
+ pushd . > /dev/null 2>&1
|
|
|
|
+ cd %{_build_root}/etc/init.d
|
|
|
|
+ mv edexServiceList edexServiceList-datadelivery
|
|
|
|
+ popd > /dev/null 2>&1
|
|
|
|
+
|
|
|
|
%pre
|
|
|
|
%post
|
|
|
|
+ # replace the service list script with the datadelivery service list script
|
|
|
|
+ if [ -f /etc/init.d/edexServiceList ]; then
|
2013-06-24 09:29:43 -04:00
|
|
|
+ mv /etc/init.d/edexServiceList /etc/init.d/edexServiceList.orig
|
2013-01-23 11:18:44 -05:00
|
|
|
+ if [ $? -ne 0 ]; then
|
|
|
|
+ exit 1
|
|
|
|
+ fi
|
|
|
|
+ fi
|
|
|
|
+ mv /etc/init.d/edexServiceList-datadelivery /etc/init.d/edexServiceList
|
|
|
|
+ if [ $? -ne 0 ]; then
|
|
|
|
+ exit 1
|
|
|
|
+ fi
|
|
|
|
+
|
|
|
|
%preun
|
2013-07-10 10:04:22 -04:00
|
|
|
+ if [ "${1}" = "1" ]; then
|
|
|
|
+ exit 0
|
|
|
|
+ fi
|
2013-06-24 09:29:43 -04:00
|
|
|
+ # restore the original service list script with the datadelivery service list script
|
|
|
|
+ if [ -f /etc/init.d/edexServiceList.orig ]; then
|
|
|
|
+ mv /etc/init.d/edexServiceList.orig /etc/init.d/edexServiceList
|
|
|
|
+ if [ $? -ne 0 ]; then
|
|
|
|
+ exit 1
|
|
|
|
+ fi
|
|
|
|
+ fi
|
2013-09-03 13:46:19 -05:00
|
|
|
+
|
2013-01-23 11:18:44 -05:00
|
|
|
%postun
|
|
|
|
|
2013-08-07 11:31:07 -05:00
|
|
|
%clean
|
2013-01-23 11:18:44 -05:00
|
|
|
***************
|
2013-08-07 11:31:07 -05:00
|
|
|
*** 67,69 ****
|
2013-09-03 13:46:19 -05:00
|
|
|
--- 109,113 ----
|
2013-01-23 11:18:44 -05:00
|
|
|
%dir /awips2
|
|
|
|
%dir /awips2/edex
|
2013-08-07 11:31:07 -05:00
|
|
|
/awips2/edex/*
|
|
|
|
+
|
|
|
|
+ %attr(744,root,root) /etc/init.d/*
|
2013-09-03 13:46:19 -05:00
|
|
|
\ No newline at end of file
|