xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master_13.5.3' into development_on_RHEL5

Browse source 
Former-commit-id: 648659c6a364b85a8531f24910ab535c9bcf73ce
This commit is contained in:
Steve Harris 2013-11-15 13:19:01 -06:00
commit be0f3bf912
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rpms/awips2.core/Installer.ldm/component.spec
View file

@ -9,7 +9,7 @@
Name: awips2-ldm Name: awips2-ldm
Summary: AWIPS II LDM Distribution Summary: AWIPS II LDM Distribution
Version: %{_ldm_version} Version: %{_ldm_version}
Release: 7 Release: 9
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch
@ -21,7 +21,7 @@ Packager: Bryan Kowal
AutoReq: no AutoReq: no
Requires: awips2-qpid-lib Requires: awips2-qpid-lib
Requires: zlib-devel requires: awips2-python
requires: awips2-python requires: awips2-python
provides: awips2-ldm provides: awips2-ldm
provides: awips2-base-component provides: awips2-base-component
@ -40,40 +40,34 @@ fi
if [ -d %{_build_root} ]; then if [ -d %{_build_root} ]; then
rm -rf %{_build_root} rm -rf %{_build_root}
fi fi
/bin/mkdir -p %{_build_root}
if [ $? -ne 0 ]; then %build
exit 1
fi %install
# create the ldm directory # create the ldm directory
/bin/mkdir -p %{_build_root}/usr/local/ldm/SOURCES /bin/mkdir -p %{_build_root}/usr/local/ldm/SOURCES
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
/bin/mkdir -p %{_build_root}/etc/profile.d /bin/mkdir -p %{_build_root}/etc/profile.d
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
/bin/mkdir -p %{_build_root}/etc/ld.so.conf.d /bin/mkdir -p %{_build_root}/etc/ld.so.conf.d
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
/bin/mkdir -p %{_build_root}/etc/logrotate.d /bin/mkdir -p %{_build_root}/etc/logrotate.d
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
/bin/mkdir -p %{_build_root}/etc/init.d /bin/mkdir -p %{_build_root}/etc/init.d
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
%build
%install
_ldm_destination=%{_build_root}/usr/local/ldm _ldm_destination=%{_build_root}/usr/local/ldm
_ldm_destination_source=${_ldm_destination}/SOURCES _ldm_destination_source=${_ldm_destination}/SOURCES
@ -182,7 +176,9 @@ fi
# create .bash_profile # create .bash_profile
if [ ! -f /usr/local/ldm/.bash_profile ]; then if [ ! -f /usr/local/ldm/.bash_profile ]; then
echo 'export PATH=$HOME/decoders:$HOME/util:$HOME/bin:$PATH' > \ echo 'umask 002' > \
/usr/local/ldm/.bash_profile
echo 'export PATH=$HOME/decoders:$HOME/util:$HOME/bin:$PATH' >> \
/usr/local/ldm/.bash_profile /usr/local/ldm/.bash_profile
echo 'export MANPATH=$HOME/share/man:/usr/share/man' >> \ echo 'export MANPATH=$HOME/share/man:/usr/share/man' >> \
/usr/local/ldm/.bash_profile /usr/local/ldm/.bash_profile