[fftw] Remove non-OpenMP / g77 build for obsolete RHEL (< 5)

konradm konradm at fedoraproject.org
Sat Dec 14 23:53:27 UTC 2013


commit aa01c17a17a4bef5f6ee3e8be4a08d08bd77ae0f
Author: Conrad Meyer <cse.cem at gmail.com>
Date:   Sat Dec 14 18:53:26 2013 -0500

    Remove non-OpenMP / g77 build for obsolete RHEL (< 5)
    
    - Remove ancient Obsoletes (fftw < 3.3, Fedora < 16)
    - Remove ancient non-Quad build (Fedora < 15)
    - Remove obsolete conditional on BuildArch: noarch (RHEL < 6, Fedora < 13)

 fftw.spec |   35 ++++++++---------------------------
 1 files changed, 8 insertions(+), 27 deletions(-)
---
diff --git a/fftw.spec b/fftw.spec
index 4859840..76199a6 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -1,30 +1,20 @@
 Name:           fftw
 Version:        3.3.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A Fast Fourier Transform library
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.fftw.org
 Source0:        http://www.fftw.org/fftw-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# OpenMP support not available on RHEL 4
-%if 0%{?rhel} == 4
-BuildRequires:  gcc-g77
-%global openmp 0
-%else
 BuildRequires:  gcc-gfortran
-%global openmp 1
-%endif
 
 %global quad 0
-# Quad precision support only available with gcc >= 4.6
-%if 0%{?fedora} >= 15
+# Quad precision support only available with gcc >= 4.6 (Fedora >= 15)
 # and only on these arches
 %ifarch %{ix86} x86_64 ia64
 %global quad 1
 %endif
-%endif
 
 # For check phase
 BuildRequires:  time
@@ -43,9 +33,6 @@ data, and of arbitrary input size.
 Summary:        FFTW run-time library
 Group:          System Environment/Libraries
 Provides:       fftw3 = %{version}-%{release}
-Obsoletes:      fftw3 < 3.3
-# Libs branched from rpm containing binaries in version 3.3
-Obsoletes:      fftw < 3.3
 # Libs rearranged in 3.3.1-2
 Obsoletes:	fftw-libs-threads < %{version}-%{release}
 Obsoletes:	fftw-libs-openmp < %{version}-%{release}
@@ -71,7 +58,6 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Provides:       fftw3-devel%{?_isa} = %{version}-%{release}
 Provides:       fftw3-devel = %{version}-%{release}
-Obsoletes:      fftw3-devel < 3.3
 
 %description devel
 FFTW is a C subroutine library for computing the Discrete Fourier
@@ -119,7 +105,6 @@ Group:          Development/Libraries
 Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 Provides:       fftw3-static%{?_isa} = %{version}-%{release}
 Provides:       fftw3-static = %{version}-%{release}
-Obsoletes:      fftw3-static < 3.3
 
 %description static
 The fftw-static package contains the statically linkable version of
@@ -128,9 +113,7 @@ the FFTW fast Fourier transform library.
 %package doc
 Summary:        FFTW library manual
 Group:          Documentation
-%if 0%{?rhel} > 5 || 0%{?fedora} > 12
 BuildArch:      noarch
-%endif
 
 %description doc
 This package contains the manual for the FFTW fast Fourier transform
@@ -140,19 +123,11 @@ library.
 %setup -q
 
 %build
-%if 0%{?rhel} == 4
-# System fortran compiler is g77
-export F77=g77
-%else
 # Configure uses g77 by default, if present on system
 export F77=gfortran
-%endif
 
 BASEFLAGS="--enable-shared --disable-dependency-tracking --enable-threads"
-
-%if %{openmp}
 BASEFLAGS+=" --enable-openmp"
-%endif
 
 # Precisions to build
 prec_name[0]=single
@@ -315,6 +290,12 @@ fi
 %{_libdir}/libfftw3*.a
 
 %changelog
+* Sat Dec 14 2013 Conrad Meyer <cemeyer at uw.edu> - 3.3.3-8
+- Remove non-OpenMP / g77 build for obsolete RHEL (< 5)
+- Remove ancient Obsoletes (fftw < 3.3, Fedora < 16)
+- Remove ancient non-Quad build (Fedora < 15)
+- Remove obsolete conditional on BuildArch: noarch (RHEL < 6, Fedora < 13)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list