SPECS: fftw.spec - simplified, rel.3

[freetz]

Author: freetz                       Date: Sun Jun 26 16:19:03 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplified, rel.3

---- Files affected:
SPECS:
   fftw.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: SPECS/fftw.spec
diff -u SPECS/fftw.spec:1.56 SPECS/fftw.spec:1.57
--- SPECS/fftw.spec:1.56	Sat Jun 25 14:43:57 2005
+++ SPECS/fftw.spec	Sun Jun 26 18:18:58 2005
@@ -8,7 +8,7 @@
 Summary(pt_BR):	Biblioteca fast Fourier transform
 Name:		fftw
 Version:	2.1.5
-Release:	2
+Release:	3
 License:	GPL
 Group:		Libraries
 Source0:	ftp://ftp.fftw.org/pub/fftw/%{name}-%{version}.tar.gz
@@ -87,17 +87,12 @@
 %patch -p1
 
 %build
-# This is important to do sfftw (Single precision library)
-%if %{with single}
-
-tar xzf %{SOURCE0}
-mv %{name}-%{version}/ single/
-cd single
-
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
+
+%if %{with single}
 %configure \
 %ifarch %{ix86}
         --enable-i386-hacks \
@@ -109,14 +104,10 @@
         --%{!?debug:dis}%{?debug:en}able-debug
 
 %{__make}
-
-cd -
+%{__make} install \
+	DESTDIR=$(pwd)/single
 %endif
 
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
 %configure \
 %ifarch %{ix86}
 	--enable-i386-hacks \
@@ -124,19 +115,13 @@
 	--enable-shared \
 	--enable-threads \
 	--%{!?debug:dis}%{?debug:en}able-debug
-#        --enable-type-prefix \
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with single}
-cd single
-%{__make} install \
-        DESTDIR=$RPM_BUILD_ROOT
-cd -
-%endif
+%{?with_single:cp -ar single $RPM_BUILD_ROOT}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -174,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2005/06/26 16:18:58  freetz
+- simplified, rel.3
+
 Revision 1.56  2005/06/25 12:43:57  blekot
 - build fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fftw.spec?r1=1.56&r2=1.57&f=u