[netcdf-fortran/f17] Cleanup cherry-pick - use rel 3.1
Orion Poplawski
orion at fedoraproject.org
Fri Apr 5 02:03:08 UTC 2013
commit 73c1161fd2691883db09f24d165c41e61cb859ba
Author: Orion Poplawski <orion at nwra.com>
Date: Thu Apr 4 19:52:16 2013 -0600
Cleanup cherry-pick - use rel 3.1
netcdf-fortran.spec | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/netcdf-fortran.spec b/netcdf-fortran.spec
index 5b18515..ace1390 100644
--- a/netcdf-fortran.spec
+++ b/netcdf-fortran.spec
@@ -1,16 +1,14 @@
Name: netcdf-fortran
Version: 4.2
-Release: 3%{?dist}
+Release: 3%{?dist}.1
Summary: Fortran libraries for NetCDF-4
Group: Applications/Engineering
License: NetCDF
URL: http://www.unidata.ucar.edu/software/netcdf/
Source0: http://www.unidata.ucar.edu/downloads/netcdf/ftp/%{name}-%{version}.tar.gz
-#Use pkgconfig in nc-config to avoid multi-lib issues
-Patch0: netcdf-pkgconfig.patch
-#Strip FFLAGS from nc-config
-Patch1: netcdf-fflags.patch
+#Use pkgconfig in nf-config to avoid multi-lib issues and remove FFLAGS
+Patch0: netcdf-fortran-pkgconfig.patch
# Fix issue parsing mpif90 output
Patch2: netcdf-postdeps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -142,7 +140,6 @@ NetCDF Fortran parallel openmpi static libraries
%prep
%setup -q
%patch0 -p1 -b .pkgconfig
-%patch1 -p1 -b .fflags
%patch2 -p1 -b .postdeps
sed -i -e '1i#!/bin/sh' examples/F90/run_f90_par_examples.sh
@@ -289,6 +286,9 @@ fi
%changelog
+* Thu Apr 4 2013 Orion Poplawski <orion at cora.nwra.com> - 4.2-3.1
+- Fix patches to use pkg-config (bug #948640)
+
* Wed Mar 7 2012 Orion Poplawski <orion at cora.nwra.com> - 4.2-3
- Don't ship info/dir file
- Add needed shbangs
More information about the scm-commits
mailing list