rpms/fftw/devel fftw.spec,1.28,1.29

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/fftw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23560

Modified Files:
	fftw.spec 
Log Message:
Added check phase plus a few other cosmetic fixes.


Index: fftw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/devel/fftw.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- fftw.spec	1 Jan 2010 23:42:18 -0000	1.28
+++ fftw.spec	2 Jan 2010 00:58:49 -0000	1.29
@@ -1,19 +1,22 @@
 Name:           fftw
 Version:        3.2.2
-Release:        1%{?dist}
-Summary:        Fast Fourier Transform library
+Release:        2%{?dist}
+Summary:        A Fast Fourier Transform library
 Group:          System Environment/Libraries
 License:        GPLv2+
-URL:            http://www.fftw.org/
+URL:            http://www.fftw.org
 Source0:        http://www.fftw.org/fftw-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran
+# For check phase
+BuildRequires:  time perl
+
 Requires(post): info 
 Requires(preun): info
 
 Provides:       fftw3 = %{version}-%{release}
-Obsoletes:      fftw3 < 3.1
+Obsoletes:      fftw3 < %{version}-%{release}
 
 %description
 FFTW is a C subroutine library for computing the Discrete Fourier
@@ -27,7 +30,7 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release} pkgconfig
 
 Provides:       fftw3-devel = %{version}-%{release}
-Obsoletes:      fftw3-devel < 3.1
+Obsoletes:      fftw3-devel < %{version}-%{release}
 
 
 %description    devel
@@ -43,6 +46,7 @@ develop programs using the FFTW fast Fou
 Summary:        Static version of the FFTW library
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
+Obsoletes:      fftw3-static < %{version}-%{release}
 Provides:       fftw3-static = %{version}-%{release}
 
 %description    static
@@ -59,7 +63,7 @@ rm -rf fftw-%{version}
 
 
 %build
-# Configure uses g77 by default
+# Configure uses g77 by default, if present on system
 export F77=gfortran
 
 CONFIG_FLAGS="--enable-shared --disable-dependency-tracking --enable-threads"
@@ -91,19 +95,19 @@ pushd long
 	make install DESTDIR=${RPM_BUILD_ROOT}
 popd
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
-find ${RPM_BUILD_ROOT}%{_libdir} -name *.la -delete
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 
+%check
+make -C single check
+make -C double check
+make -C long check
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
 %post -p /sbin/ldconfig
-
-
 %postun -p /sbin/ldconfig
 
-
 %post devel
 /sbin/install-info --section="Math" %{_infodir}/%{name}.info.gz %{_infodir}/dir  2>/dev/null || :
 
@@ -112,7 +116,6 @@ if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
 fi
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
@@ -134,27 +137,34 @@ fi
 
 
 %changelog
-* Fri Jan 1 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 3.2.2-1
+* Sat Jan 2 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> 3.2.2-2
+- Add check phase.
+- Cosmetic changes to spec file (unified changelog format, removed unnecessary
+  space).
+- Use rm instead of find -delete, as latter is not present on EPEL-4.
+- Generalize obsoletes of fftw3 packages. Add Obsoletes: fftw3-static.
+
+* Fri Jan 1 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> 3.2.2-1
 - Update to 3.2.2.
 - Make file listings more explicit.
 - Don't use file dependencies for info.
 
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-3
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 3.2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-2
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 3.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Sat Feb 14 2009 Conrad Meyer <konrad at tylerc.org> - 3.2.1-1
+* Sat Feb 14 2009 Conrad Meyer <konrad at tylerc.org> 3.2.1-1
 - Bump to 3.2.1.
 
-* Thu Dec 4 2008 Conrad Meyer <konrad at tylerc.org> - 3.2-1
+* Thu Dec 4 2008 Conrad Meyer <konrad at tylerc.org> 3.2-1
 - Bump to 3.2.
 
-* Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.1.2-7
+* Fri Jul 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.1.2-7
 - fix license tag
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.1.2-6
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> 3.1.2-6
 - Autorebuild for GCC 4.3
 
 * Fri Aug 24 2007 Quentin Spencer <qspencer at users.sf.net> 3.1.2-5
@@ -191,7 +201,7 @@ fi
 - 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
+* 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