rpms/cernlib/devel cernlib.spec,1.21,1.22

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10388

Modified Files:
	cernlib.spec 
Log Message:
* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15
- add conditionals in spec to have only one for all fedora versions.



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cernlib.spec	11 Apr 2006 22:53:00 -0000	1.21
+++ cernlib.spec	11 Apr 2006 23:12:13 -0000	1.22
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       14%{?dist}.1
+Release:       15%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -12,21 +12,30 @@
 #BuildRequires: gcc-g77
 #Requires:      libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 # fedora core
-# fc 3
-#BuildRequires: xorg-x11-devel lapack blas openmotif-devel
-# fc 4
-#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
-# fc devel
-BuildRequires: imake lapack-devel blas-devel openmotif-devel 
-# for patchy build scripts
-BuildRequires: tcsh
+BuildRequires: openmotif-devel
+%if "%fedora" <= "3"
+BuildRequires: lapack blas
+%else
+BuildRequires: lapack-devel blas-devel
+%endif
+
+%if "%fedora" <= "4"
+BuildRequires: xorg-x11-devel 
+%else
+BuildRequires: imake 
 # workaround #173530
 BuildRequires: libXau-devel
+%endif
+# for patchy build scripts
+BuildRequires: tcsh
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if "%fedora" > "3"
+# f771 segfaults on x86_64
 ExcludeArch:   x86_64
+%endif
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -218,9 +227,17 @@
 
 %package devel
 Summary:       General purpose CERN library static libraries and headers
-Requires:      lapack-devel blas-devel openmotif-devel
+Requires:      openmotif-devel
+%if "%fedora" <= "3"
+Requires:       lapack blas
+%else
+Requires:       lapack-devel blas-devel
+%endif
+
+%if "%fedora" > "4"
 # workaround #173530
 Requires:      libXau-devel
+%endif
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
@@ -797,7 +814,10 @@
 
 
 %changelog
-* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14.1
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15
+- add conditionals in spec to have only one for all fedora versions.
+
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14
 - add patchy version 4 and build cernlib patchy. From Mattias Ellert.
 - update to newer debian patchset