rpms/fftw/EL-4 fftw.spec,1.10,1.11

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/fftw/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11862/EL-4

Modified Files:
	fftw.spec 
Log Message:
Revert package name change for RPMforge compatibility.


Index: fftw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/EL-4/fftw.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fftw.spec	2 Jan 2010 00:45:54 -0000	1.10
+++ fftw.spec	8 Jan 2010 21:51:23 -0000	1.11
@@ -1,6 +1,11 @@
-Name:           fftw
+# For RPMForge compatibility - the fftw package was in RPMForge before Fedora
+# EPEL was started, and is of version 2, which is API incompatible with the 3
+# series.
+Name:           fftw3
+Provides:       fftw = %{version}-%{release}
+
 Version:        3.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast Fourier Transform library
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -19,8 +24,6 @@ BuildRequires: time perl
 Requires(post): info 
 Requires(preun): info
 
-Provides:       fftw3 = %{version}-%{release}
-Obsoletes:      fftw3 < %{version}-%{release}
 
 %description
 FFTW is a C subroutine library for computing the Discrete Fourier
@@ -32,10 +35,8 @@ data, and of arbitrary input size.
 Summary:        Headers, libraries and docs for the FFTW library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release} pkgconfig
-
-Provides:       fftw3-devel = %{version}-%{release}
-Obsoletes:      fftw3-devel < %{version}-%{release}
-
+Requires:	pkgconfig
+Provides:       fftw-devel = %{version}-%{release}
 
 %description    devel
 FFTW is a C subroutine library for computing the Discrete Fourier
@@ -50,8 +51,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}
+Provides:       fftw-static = %{version}-%{release}
 
 %description    static
 The fftw-static package contains the statically linkable version of
@@ -145,6 +145,10 @@ fi
 
 
 %changelog
+* Fri Jan 8 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> 3.2.2-2
+- Revert package name change due to RPMForge compatibility (fftw is version 2
+  series in RPMForge).
+
 * Fri Jan 1 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> 3.2.2-1
 - Update to 3.2.2 from rawhide tree.
 - Change name of package to fftw(-devel) to conform with Package Naming