diff --git a/dependency/zlib-1.2.11.sh b/dependency/zlib-1.2.11.sh index 93f4b8601f3de6f574a6bada5225c09b780b6b51..881a5d372ff6b587f82c3f2a1f757da47b6adf4c 100644 --- a/dependency/zlib-1.2.11.sh +++ b/dependency/zlib-1.2.11.sh @@ -17,7 +17,7 @@ if [[ "$1" =~ .*/$ ]]; then buildpath=${buildpath%/*}; fi if [[ "$2" =~ .*/$ ]]; then installpath=${installpath%/*}; fi yum install -y wget tar environment-modules -wget -t 0 -c -P $buildpath http://zlib.net/zlib-1.2.11.tar.gz +wget -t 0 -c -P $buildpath http://www.zlib.net/fossils/zlib-1.2.11.tar.gz tar xf $buildpath/zlib-1.2.11.tar.gz -C $buildpath && rm -rf $buildpath/zlib-1.2.11.tar.gz cd $buildpath/zlib-1.2.11 diff --git a/wrf.spec b/wrf.spec index f552e5d126a39f68f0f0639bcd6ec15cf083608b..4559db5a87aedddae93f64324315a435781ee384 100644 --- a/wrf.spec +++ b/wrf.spec @@ -1,6 +1,7 @@ %define debug_package %{nil} %define __debug_install_post %{_rpmconfigdir}/find-debuginfo.sh %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"%{nil} %define wrf_install_path /usr/local/wrf/wrf-4.2 +%define packing_dir /usr/local/wrf Name:WRF Version:4.2 @@ -39,7 +40,7 @@ mkdir -p $RPM_BUILD_ROOT%{wrf_install_path} cp -r %{_builddir}/%{name}-%{version}/* $RPM_BUILD_ROOT%{wrf_install_path} %files %doc -%{wrf_install_path} +%{packing_dir} %clean rm -rf $RPM_BUILD_ROOT %{_builddir}/*