rpms/fftw/EL-4 .cvsignore, 1.2, 1.3 fftw.spec, 1.5, 1.6 sources, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/fftw/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1550

Modified Files:
	.cvsignore fftw.spec sources 
Log Message:
sync w/EL-5 branch:
* Tue Jul 10 2007 Rex Dieter <rdieter[AT]fedoraprojet.org> 3.1.2-4
- (re)name -> fftw3 (epel-only, for rpmforge compatibility)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:17:17 -0000	1.2
+++ .cvsignore	12 Jul 2007 15:27:28 -0000	1.3
@@ -1 +1 @@
-fftw-2.1.5.tar.gz
+fftw-3.1.2.tar.gz


Index: fftw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/EL-4/fftw.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fftw.spec	11 Nov 2004 19:21:36 -0000	1.5
+++ fftw.spec	12 Jul 2007 15:27:28 -0000	1.6
@@ -1,119 +1,195 @@
+
 Name:           fftw
-Version:        2.1.5
-Release:        5
-Summary:        Fast Fourier Transform library.
+Version:        3.1.2
+Release:        4%{?dist}
+Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.fftw.org/
-Source0:        ftp://ftp.fftw.org/pub/fftw/fftw-2.1.5.tar.gz
+Source0:        ftp://ftp.fftw.org/pub/fftw/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
+BuildRequires:  gcc-gfortran
+%else
 BuildRequires:  gcc-g77
+%endif
+
+# rpmforge compatibility
+%if 0%{?rhel} > 1
+%define name_compat fftw3
+%else
+%define name_compat %{name}
+%endif
+
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
-FFTW is a C subroutine library for computing the Discrete Fourier Transform
-(DFT) in one or more dimensions, of both real and complex data, and of
-arbitrary input size. We believe that FFTW, which is free software, should
-become the FFT library of choice for most applications. Our benchmarks,
-performed on on a variety of platforms, show that FFTW's performance is
-typically superior to that of other publicly available FFT software.
+FFTW is a C subroutine library for computing the Discrete Fourier
+Transform (DFT) in one or more dimensions, of both real and complex
+data, and of arbitrary input size.
 
+%if "%{name}" == "%{name_compat}"
 
-%package        devel
-Summary:        Headers, libraries and docs for the FFTW library.
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Provides:       fftw3 = %{version}-%{release}
+Obsoletes:      fftw3 < 3.1
+
+%else
 
-%description    devel
-FFTW is a C subroutine library for computing the Discrete Fourier Transform
-(DFT) in one or more dimensions, of both real and complex data, and of
-arbitrary input size. We believe that FFTW, which is free software, should
-become the FFT library of choice for most applications. Our benchmarks,
-performed on on a variety of platforms, show that FFTW's performance is
-typically superior to that of other publicly available FFT software.
+%package -n %{name_compat}
+Summary:        Fast Fourier Transform library 
+Group:          System Environment/Libraries 
+%description -n %{name_compat}
+FFTW is a C subroutine library for computing the Discrete Fourier
+Transform (DFT) in one or more dimensions, of both real and complex
+data, and of arbitrary input size.
+
+%endif
+
+%package -n %{name_compat}-devel
+Summary:        Headers, libraries and docs for the FFTW library
+Group:          Development/Libraries
+Requires:       %{name_compat} = %{version}-%{release}
+Requires:	pkgconfig
+%if "%{name}" == "%{name_compat}"
+Provides:       fftw3-devel = %{version}-%{release}
+Obsoletes:      fftw3-devel < 3.1
+%endif
+%description -n %{name_compat}-devel
+FFTW is a C subroutine library for computing the Discrete Fourier
+Transform (DFT) in one or more dimensions, of both real and complex
+data, and of arbitrary input size.
 
 This package contains header files and development libraries needed to
 develop programs using the FFTW fast Fourier transform library.
 
 
-
 %prep
 %setup -q -c %{name}-%{version}
 mv %{name}-%{version} single
 cp -a single double
-
+cp -a single long
 
 
 %build
+CONFIG_FLAGS="--enable-shared --disable-dependency-tracking --enable-threads"
+
 pushd double
-	%ifarch i386
-		%configure \
-			--enable-shared \
-			--enable-threads \
-			--enable-i386-hacks
-	%else
-		%configure \
-			--enable-shared \
-			--enable-threads
-	%endif
+	%configure $CONFIG_FLAGS
 	make %{?_smp_mflags}
 popd
+
 pushd single
-	%configure \
-		--enable-shared \
-		--enable-type-prefix \
-		--enable-threads \
-		--enable-float
+	%configure $CONFIG_FLAGS --enable-single
 	make %{?_smp_mflags}
 popd
 
+pushd long
+	%configure $CONFIG_FLAGS --enable-long-double
+	make %{?_smp_mflags}
+popd
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
+
 pushd double
 	make install DESTDIR=${RPM_BUILD_ROOT}
 	cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO ../
-	cp -a FAQ/fftw-faq.html/ doc/ ../
+	cp -a doc/ ../
 popd
+
 pushd single
 	make install DESTDIR=${RPM_BUILD_ROOT}
 popd
-rm -f doc/Makefile*
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
+pushd long
+	make install DESTDIR=${RPM_BUILD_ROOT}
+popd
+
+# Unpackaged files
+rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
+%post -n %{name_compat} -p /sbin/ldconfig
 
-%post -p /sbin/ldconfig
-
+%postun -n %{name_compat} -p /sbin/ldconfig
 
+%post -n %{name_compat}-devel
+/sbin/install-info --section="Math" %{_infodir}/%{name}.info.gz %{_infodir}/dir  2>/dev/null || :
 
-%postun -p /sbin/ldconfig
+%preun -n %{name_compat}-devel
+if [ "$1" = 0 ]; then
+  /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
+fi
 
 
-
-%files
+%files -n %{name_compat}
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
-%{_libdir}/*.so.*
+%{_bindir}/*
+%{_libdir}/lib*.so.*
+%{_mandir}/man?/*
 
-%files devel
+%files -n %{name_compat}-devel
 %defattr(-,root,root,-)
-%doc  doc/
+%doc doc/*.pdf doc/html/* doc/FAQ/fftw-faq.html/
 %{_includedir}/*
-%{_libdir}/*.a
-%{_libdir}/*.so
-%{_infodir}/*
-
+%{_infodir}/*.info*
+%{_libdir}/pkgconfig/*
+%{_libdir}/lib*.so
+%{_libdir}/lib*.a
 
 
 %changelog
+* Tue Jul 10 2007 Rex Dieter <rdieter[AT]fedoraprojet.org> 3.1.2-4
+- (re)name -> fftw3 (epel-only, for rpmforge compatibility)
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.2-3
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Tue Sep 26 2006 Quentin Spencer <qspencer at users.sf.net> 3.1.2-2
+- BuildRequires: pkgconfig for -devel (bug 206444).
+
+* Fri Sep  8 2006 Quentin Spencer <qspencer at users.sf.net> 3.1.2-1
+- New release.
+
+* Fri Jun  2 2006 Quentin Spencer <qspencer at users.sf.net> 3.1.1-1
+- New upstream release.
+
+* Fri Feb 24 2006 Quentin Spencer <qspencer at users.sf.net> 3.1-4
+- Re-enable static libs (bug 181897).
+- Build long-double version of libraries (bug 182587).
+
+* Mon Feb 13 2006 Quentin Spencer <qspencer at users.sf.net> 3.1-3
+- Add Obsoletes and Provides.
+
+* Mon Feb 13 2006 Quentin Spencer <qspencer at users.sf.net> 3.1-2
+- Rebuild for Fedora Extras 5.
+- Disable static libs.
+- Remove obsolete configure options.
+
+* Wed Feb  1 2006 Quentin Spencer <qspencer at users.sf.net> 3.1-1
+- Upgrade to the 3.x branch, incorporating changes from the fftw3 spec file.
+- Add dist tag.
+
+* Mon May 23 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.5-8
+- BuildReq gcc-gfortran (#156490).
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.1.5-7
+- rebuild on all arches
+- buildrequire compat-gcc-32-g77
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 2.1.5-5
 - Bump release to provide Extras upgrade path.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:17:17 -0000	1.2
+++ sources	12 Jul 2007 15:27:28 -0000	1.3
@@ -1 +1 @@
-8d16a84f3ca02a785ef9eb36249ba433  fftw-2.1.5.tar.gz
+08f2e21c9fd02f4be2bd53a62592afa4  fftw-3.1.2.tar.gz