rpms/fftw/EL-5 fftw.spec,1.20,1.21

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	fftw.spec 
Log Message:
* Thu Jul 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.1.2-5
- fftw3(-devel): Provides: fftw(-devel) = %version ...
- cleanup, +%check section (disabled by default)



Index: fftw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/EL-5/fftw.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- fftw.spec	12 Jul 2007 15:32:25 -0000	1.20
+++ fftw.spec	12 Jul 2007 16:58:48 -0000	1.21
@@ -1,7 +1,7 @@
 
 Name:           fftw
 Version:        3.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
@@ -41,6 +41,7 @@
 %package -n %{name_compat}
 Summary:        Fast Fourier Transform library 
 Group:          System Environment/Libraries 
+Provides:	%{name} = %{version}-%{release}
 %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
@@ -56,6 +57,8 @@
 %if "%{name}" == "%{name_compat}"
 Provides:       fftw3-devel = %{version}-%{release}
 Obsoletes:      fftw3-devel < 3.1
+%else
+Provides:	%{name}-devel = %{version}-%{release}
 %endif
 %description -n %{name_compat}-devel
 FFTW is a C subroutine library for computing the Discrete Fourier
@@ -92,28 +95,35 @@
 popd
 
 
+
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
+# grab copy of docs
 pushd double
-	make install DESTDIR=${RPM_BUILD_ROOT}
 	cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO ../
 	cp -a doc/ ../
 popd
 
-pushd single
-	make install DESTDIR=${RPM_BUILD_ROOT}
-popd
-
-pushd long
-	make install DESTDIR=${RPM_BUILD_ROOT}
-popd
+make install DESTDIR=${RPM_BUILD_ROOT} -C double
+make install DESTDIR=${RPM_BUILD_ROOT} -C single
+make install DESTDIR=${RPM_BUILD_ROOT} -C long
 
 # Unpackaged files
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 
 
+%check
+# disbabled by default, rediculously long.
+%if "%{?_with_check}" != "%{nil}"
+make check -C double
+make check -C single
+make check -C long
+%endif
+
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -149,7 +159,11 @@
 
 
 %changelog
-* Tue Jul 10 2007 Rex Dieter <rdieter[AT]fedoraprojet.org> 3.1.2-4
+* Thu Jul 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.1.2-5
+- fftw3(-devel): Provides: fftw(-devel) = %%version ...
+- cleanup, +%%check section (disabled by default)
+
+* Tue Jul 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.1.2-4
 - (re)name -> fftw3 (epel-only, for rpmforge compatibility, #246004)
 
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.2-3