rpms/cernlib-g77/EL-5 cernlib-g77.spec,1.1,1.2

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/cernlib-g77/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10332

Modified Files:
	cernlib-g77.spec 
Log Message:
* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 2006-21
- no --build-id for EL-5



Index: cernlib-g77.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib-g77/EL-5/cernlib-g77.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-g77.spec	31 Dec 2007 00:37:10 -0000	1.1
+++ cernlib-g77.spec	31 Dec 2007 10:13:40 -0000	1.2
@@ -35,6 +35,14 @@
 %define compiler_string -g77
 %if ! 0%{?g77_cernlib_compiler}
 %define compiler -g77
+
+# there is no --build-id in RHEL 5.
+%if 0%{?rhel}
+%if "%rhel" <= "5"
+%define no_build_id 1
+%endif
+%endif
+
 %endif
 # no compat prefix, the utilities compiled with gfortran are non functionnal
 # see Bug 241416
@@ -47,7 +55,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       20%{?dist}
+Release:       21%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -75,7 +83,7 @@
 %endif
 
 # indirectly requires lesstif or openmotif and X libs
-BuildRequires: xbae-devel 
+BuildRequires: xbae-devel
 
 # for patchy build scripts
 BuildRequires: tcsh
@@ -110,7 +118,7 @@
 Source203: patchy-unpack-rceta 
 
 # Shell scripts that go in /etc/profile.d
-# Currently they are not installed since tey do more harm than good, when
+# Currently they are not installed since they do more harm than good, when
 # parallel cernlib versions are installed.
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
@@ -127,7 +135,7 @@
 Source200: cernlib-remove-deadpool
 Source201: cernlib-deadpool.txt
 # copyright.in from the non split debian patchset
-Source203: cernlib-debian-copyright.in
+Source204: cernlib-debian-copyright.in
 
 # debian patchsets
 Patch100001: http://ftp.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-2.diff.gz
@@ -341,7 +349,7 @@
 scripts from the utils subpackage.
 
 %package devel
-Summary:       General purpose CERN library development package 
+Summary:       General purpose CERN library development package
 
 %if 0%{?old_lapack_name}
 Requires:       lapack blas
@@ -560,13 +568,9 @@
 %patch -P 3 -p1
 %patch -P 100 -p1
 %patch -P 101 -p1
-# miscompilation and ICE with optimized code should be fixed with gfortran
-# there is still some code with -O0 from upstream, they are kept as-is
-%if ! %{with gfortran}
 %patch -P 10201 -p1
 %patch -P 10202 -p1
 %patch -P 10203 -p1
-%endif
 %patch -P 103 -p1
 %patch -P 104 -p1
 %patch -P 10501 -p1
@@ -874,7 +878,11 @@
 # optflags are different for g77, so we remove problematic flags
 FC_OPTFLAGS=`echo "%optflags" | sed -e 's/-mtune=[^ ]\+//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=[^ ]\+//'`
 # this is needed (at least in F-8).
+%if 0%{?no_build_id}
+G_LDFLAGS=
+%else
 G_LDFLAGS='-Wl,--build-id'
+%endif
 FC_COMPILER=g77
 %endif
 
@@ -1410,6 +1418,9 @@
 %endif
 
 %changelog
+* Mon Dec 31 2007 Patrice Dumas <pertusus at free.fr> 2006-21
+- no --build-id for EL-5
+
 * Tue Oct 30 2007 Patrice Dumas <pertusus at free.fr> 2006-20
 - don't use the same spec for epel4
 - always ship the packages with compiler suffix. This is needed for