rpms/cernlib/EL-5 cernlib.spec,1.39,1.40

[Patrice Dumas (pertusus)]

Author: pertusus

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

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



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/EL-5/cernlib.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cernlib.spec	28 Dec 2007 23:03:53 -0000	1.39
+++ cernlib.spec	1 Jan 2008 00:41:14 -0000	1.40
@@ -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}.1
+Release:       21%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -870,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
 
@@ -1406,7 +1418,10 @@
 %endif
 
 %changelog
-* Tue Oct 30 2007 Patrice Dumas <pertusus at free.fr> 2006-20.1
+* 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 
   proper upgrade path as soon as such a package has been ever shipped