fix bug #156748 and several small clean-ups
This commit is contained in:
parent
a574b44de8
commit
904083dbf8
35
netcdf.spec
35
netcdf.spec
@ -1,6 +1,9 @@
|
|||||||
|
%define dist .fc3
|
||||||
|
%define fedora 3
|
||||||
|
|
||||||
Name: netcdf
|
Name: netcdf
|
||||||
Version: 3.6.0
|
Version: 3.6.0
|
||||||
Release: 1.p1
|
Release: 2.p1%{?dist}
|
||||||
Summary: Libraries for the Unidata network Common Data Form (NetCDF v3)
|
Summary: Libraries for the Unidata network Common Data Form (NetCDF v3)
|
||||||
|
|
||||||
Group: Applications/Engineering
|
Group: Applications/Engineering
|
||||||
@ -14,7 +17,7 @@ BuildRequires: gcc-g77
|
|||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for netcdf-3
|
Summary: Development files for netcdf-3
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
#Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
NetCDF-3 (network Common Data Form ver3) is an interface for
|
NetCDF-3 (network Common Data Form ver3) is an interface for
|
||||||
@ -65,22 +68,27 @@ export CPPFLAGS="-fPIC"
|
|||||||
# The parallel build was tested and it does NOT work.
|
# The parallel build was tested and it does NOT work.
|
||||||
# make %{?_smp_mflags}
|
# make %{?_smp_mflags}
|
||||||
make
|
make
|
||||||
|
unset FC
|
||||||
|
unset CPPFLAGS
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
mkdir $RPM_BUILD_ROOT
|
mkdir ${RPM_BUILD_ROOT}
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/netcdf-3
|
mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/netcdf-3
|
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}
|
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_mandir}
|
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}
|
||||||
cd src
|
cd src
|
||||||
%makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \
|
%makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \
|
||||||
LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \
|
LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \
|
||||||
MANDIR=$RPM_BUILD_ROOT/%{_mandir}
|
MANDIR=${RPM_BUILD_ROOT}%{_mandir}
|
||||||
rm -rf $RPM_BUILD_ROOT/%{_mandir}/man3f*
|
rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f*
|
||||||
|
find ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 -type f | xargs chmod 644
|
||||||
|
find ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 -type f | xargs chmod 644
|
||||||
|
find ${RPM_BUILD_ROOT}%{_mandir} -type f | xargs chmod 644
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
@ -97,6 +105,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 5 2005 Ed Hill <ed@eh3.com> - 3.6.0-2.p1
|
||||||
|
- make netcdf-devel require netcdf (bug #156748)
|
||||||
|
- cleanup environment and paths
|
||||||
|
- fix file permissions
|
||||||
|
|
||||||
* Sat Mar 5 2005 Ed Hill <ed@eh3.com> - 0:3.6.0-1.p1
|
* Sat Mar 5 2005 Ed Hill <ed@eh3.com> - 0:3.6.0-1.p1
|
||||||
- update for 3.6.0-p1 large-files-bug fix and remove the Epoch
|
- update for 3.6.0-p1 large-files-bug fix and remove the Epoch
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user