Cleanup for epel7

This commit is contained in:
Orion Poplawski 2014-02-06 19:11:00 -07:00
commit 67929e2ebb
3 changed files with 29 additions and 24 deletions

2
.gitignore vendored
View File

@ -7,3 +7,5 @@ netcdf-4.1.1.tar.gz
/netcdf-4.2.1-rc1.tar.gz
/netcdf-4.2.1.tar.gz
/netcdf-4.2.1.1.tar.gz
/netcdf-4.3.0.tar.gz
/v4.3.1.1.tar.gz

View File

@ -1,22 +1,25 @@
Name: netcdf
Version: 4.2.1.1
Release: 5%{?dist}
Version: 4.3.1.1
Release: 1%{?dist}
Summary: Libraries for the Unidata network Common Data Form
Group: Applications/Engineering
License: NetCDF
URL: http://www.unidata.ucar.edu/software/netcdf/
Source0: http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-%{version}.tar.gz
# Use github tarball - the unidata download is missing files
Source0: https://github.com/Unidata/netcdf-c/archive/v%{version}.tar.gz
#Source0: http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-%{version}.tar.gz
#Source0: http://www.unidata.ucar.edu/downloads/netcdf/ftp/snapshot/netcdf-4-daily.tar.gz
#Use pkgconfig in nc-config to avoid multi-lib issues
Patch0: netcdf-pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: chrpath
BuildRequires: doxygen
BuildRequires: hdf-static
BuildRequires: hdf5-devel >= 1.8.4
BuildRequires: gawk
BuildRequires: libcurl-devel
BuildRequires: m4
BuildRequires: zlib-devel
%ifnarch s390 s390x %{arm}
BuildRequires: valgrind
@ -107,8 +110,6 @@ Group: Development/Libraries
Requires: mpich
BuildRequires: mpich-devel
BuildRequires: hdf5-mpich-devel >= 1.8.4
Provides: %{name}-mpich2 = %{version}-%{release}
Obsoletes: %{name}-mpich2 < 4.2.1.1-5
%description mpich
NetCDF parallel mpich libraries
@ -122,8 +123,6 @@ Requires: mpich
Requires: pkgconfig
Requires: hdf5-mpich-devel
Requires: libcurl-devel
Provides: %{name}-mpich2-devel = %{version}-%{release}
Obsoletes: %{name}-mpich2-devel < 4.2.1.1-5
%description mpich-devel
NetCDF parallel mpich development files
@ -133,8 +132,6 @@ NetCDF parallel mpich development files
Summary: NetCDF mpich static libraries
Group: Development/Libraries
Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release}
Provides: %{name}-mpich2-static = %{version}-%{release}
Obsoletes: %{name}-mpich2-static < 4.2.1.1-5
%description mpich-static
NetCDF parallel mpich static libraries
@ -177,7 +174,7 @@ NetCDF parallel openmpi static libraries
%prep
%setup -q -n %{name}-%{version}
%setup -q -n %{name}-c-%{version}
%patch0 -p1 -b .pkgconfig
@ -190,8 +187,12 @@ NetCDF parallel openmpi static libraries
--enable-netcdf-4 \\\
--enable-dap \\\
--enable-extra-example-tests \\\
CPPFLAGS=-I%{_includedir}/hdf \\\
LIBS="-ldf -ljpeg" \\\
--enable-hdf4 \\\
--disable-dap-remote-tests \\\
%{nil}
export LDFLAGS="%{__global_ldflags} -L%{_libdir}/hdf"
# Serial build
mkdir build
@ -253,10 +254,6 @@ make -C build check
%endif
%clean
rm -rf ${RPM_BUILD_ROOT}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -268,7 +265,7 @@ rm -rf ${RPM_BUILD_ROOT}
%{_bindir}/ncdump
%{_bindir}/ncgen
%{_bindir}/ncgen3
%{_libdir}/*.so.*
%{_libdir}/*.so.7*
%{_mandir}/man1/*
%files devel
@ -289,7 +286,7 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/mpich/bin/ncdump
%{_libdir}/mpich/bin/ncgen
%{_libdir}/mpich/bin/ncgen3
%{_libdir}/mpich/lib/*.so.*
%{_libdir}/mpich/lib/*.so.7*
%doc %{_libdir}/mpich/share/man/man1/*.1*
%files mpich-devel
@ -310,7 +307,7 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/openmpi/bin/ncdump
%{_libdir}/openmpi/bin/ncgen
%{_libdir}/openmpi/bin/ncgen3
%{_libdir}/openmpi/lib/*.so.*
%{_libdir}/openmpi/lib/*.so.7*
%doc %{_libdir}/openmpi/share/man/man1/*.1*
%files openmpi-devel
@ -326,9 +323,15 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
* Wed Jul 24 2013 Deji Akingunola <dakingun@gmail.com> - 4.2.1.1-5
- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
* Thu Feb 6 2014 Orion Poplawski <orion@cora.nwra.com> - 4.3.1.1-1
- Update to 4.3.1.1
- Add BR m4
* Thu Dec 5 2013 Orion Poplawski <orion@cora.nwra.com> - 4.3.0-7
- Use BR hdf-static (bug #1038280)
* Mon Nov 4 2013 Orion Poplawski <orion@cora.nwra.com> - 4.3.0-6
- Enable hdf4 support
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@ -532,10 +535,10 @@ rm -rf ${RPM_BUILD_ROOT}
- building the library twice (once each for g77 and gfortran)
fixes an annoying problem for people who need both compilers
* Fri Sep 29 2005 Ed Hill <ed@eh3.com> - 3.6.0-7.p1
* Fri Sep 30 2005 Ed Hill <ed@eh3.com> - 3.6.0-7.p1
- add FFLAGS="-fPIC"
* Fri Jun 13 2005 Ed Hill <ed@eh3.com> - 3.6.0-6.p1
* Fri Jun 10 2005 Ed Hill <ed@eh3.com> - 3.6.0-6.p1
- rebuild
* Fri Jun 3 2005 Ed Hill <ed@eh3.com> - 3.6.0-5.p1
@ -544,7 +547,7 @@ rm -rf ${RPM_BUILD_ROOT}
* Mon May 9 2005 Ed Hill <ed@eh3.com> - 3.6.0-4.p1
- remove hard-coded dist/fedora macros
* Wed May 5 2005 Ed Hill <ed@eh3.com> - 3.6.0-3.p1
* Wed May 4 2005 Ed Hill <ed@eh3.com> - 3.6.0-3.p1
- make netcdf-devel require netcdf (bug #156748)
- cleanup environment and paths

View File

@ -1 +1 @@
5eebcf19e6ac78a61c73464713cbfafc netcdf-4.2.1.1.tar.gz
24f7f5fd13e0b01ef83de223e05c1ba1 v4.3.1.1.tar.gz