rpms/fftw/FC-4 fftw.spec,1.13,1.14

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/fftw/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27344

Modified Files:
	fftw.spec 
Log Message:
Close 3 new bugs.


Index: fftw.spec
===================================================================
RCS file: /cvs/extras/rpms/fftw/FC-4/fftw.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fftw.spec	15 Feb 2006 17:05:40 -0000	1.13
+++ fftw.spec	24 Feb 2006 06:39:13 -0000	1.14
@@ -12,7 +12,9 @@
 BuildRequires:  gcc-gfortran
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Obsoletes:      fftw3
+
+Provides:       fftw3 = %{version}-%{release}
+Obsoletes:      fftw3 < 3.1
 
 
 %description
@@ -25,8 +27,9 @@
 Summary:        Headers, libraries and docs for the FFTW library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Obsoletes:      fftw3-devel
 
+Provides:       fftw3-devel = %{version}-%{release}
+Obsoletes:      fftw3-devel < 3.1
 
 %description    devel
 FFTW is a C subroutine library for computing the Discrete Fourier
@@ -41,10 +44,11 @@
 %setup -q -c %{name}-%{version}
 mv %{name}-%{version} single
 cp -a single double
+cp -a single long
 
 
 %build
-CONFIG_FLAGS="--enable-shared --disable-static --disable-dependency-tracking --enable-threads"
+CONFIG_FLAGS="--enable-shared --disable-dependency-tracking --enable-threads"
 pushd double
 	%configure $CONFIG_FLAGS
 	make %{?_smp_mflags}
@@ -53,6 +57,10 @@
 	%configure $CONFIG_FLAGS --enable-single
 	make %{?_smp_mflags}
 popd
+pushd long
+	%configure $CONFIG_FLAGS --enable-long-double
+	make %{?_smp_mflags}
+popd
 
 
 %install
@@ -65,6 +73,9 @@
 pushd single
 	make install DESTDIR=${RPM_BUILD_ROOT}
 popd
+pushd long
+	make install DESTDIR=${RPM_BUILD_ROOT}
+popd
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
 
@@ -100,10 +111,17 @@
 %doc %{_infodir}/*.info*
 %exclude %{_libdir}/*.la
 %{_includedir}/*
+%{_libdir}/*.a
 %{_libdir}/pkgconfig/*
 %{_libdir}/*.so
 
+
 %changelog
+* Fri Feb 24 2006 Quentin Spencer <qspencer at users.sf.net> 3.1-3
+- Re-enable static libs (bug 181897).
+- Add Provides and fix Obsoletes (bug 181990).
+- Build long-double version of libraries (bug 182587).
+
 * Mon Feb 13 2006 Quentin Spencer <qspencer at users.sf.net> 3.1-2
 - Obsolete fftw3 (bug 181628).
 - Disable static libs.