rpms/cernlib/devel 702-patch-Imakefiles-for-packlib-mathlib.dpatch, 1.2, 1.3 cernlib.m4, 1.3, 1.4 cernlib.spec, 1.75, 1.76

[Patrice Dumas]

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23580

Modified Files:
	702-patch-Imakefiles-for-packlib-mathlib.dpatch cernlib.m4 
	cernlib.spec 
Log Message:
* Wed Oct  1 2008 Patrice Dumas <pertusus at free.fr> 2006-31
- correct 702-patch-Imakefiles-for-packlib-mathlib to apply with fuzz 0



Index: 702-patch-Imakefiles-for-packlib-mathlib.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/702-patch-Imakefiles-for-packlib-mathlib.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 702-patch-Imakefiles-for-packlib-mathlib.dpatch	13 Jan 2008 14:09:34 -0000	1.2
+++ 702-patch-Imakefiles-for-packlib-mathlib.dpatch	1 Oct 2008 07:33:13 -0000	1.3
@@ -83,7 +83,7 @@
 -LIBDIRS= gen bvsl
 +LIBDIRS= gen bvsl hbook /* hdiff stuff moved from packlib */
  
- /* Lapack is independent of CERNLIB and should be installed as one of
+ /* Lapack is independent of Cernlib and should be installed as one of
     the build dependencies.
 diff -urNad cernlib-2005.05.09/src/packlib/hbook/d/Imakefile /tmp/dpep.aVAPwe/cernlib-2005.05.09/src/packlib/hbook/d/Imakefile
 --- cernlib-2005.05.09/src/packlib/hbook/d/Imakefile	1969-12-31 19:00:00.000000000 -0500


Index: cernlib.m4
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cernlib.m4	25 Jan 2006 12:51:47 -0000	1.3
+++ cernlib.m4	1 Oct 2008 07:33:13 -0000	1.4
@@ -60,6 +60,9 @@
 CERNLIB_PATH=
 CERNLIB_LIB_PATH=
 CERNLIB_BIN_PATH=
+
+AC_ARG_VAR([CERNLIB_BIN],[Cernlib compile script])
+
 CERNLIB_STATIC=yes
 AC_ARG_WITH(static_cernlib,
 [  --with-static-cernlib             link statically with the cernlib],
@@ -72,14 +75,21 @@
    CERNLIB_BIN_PATH=$CERNLIB_PATH/bin
 ])
 
-CERNLIB_BIN=
 
 if test "z$CERNLIB_STATIC" != "zno"; then    
     CERNLIB_STATIC=yes
-    if test "z$CERNLIB_PATH" = z; then
-        AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
-        if test $CERNLIB_BIN = no; then
-            AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
+    if test "z$CERNLIB_PATH" = z ; then
+        if test "z$CERNLIB_BIN" = z ; then
+            AC_PATH_PROG(CERNLIB_BIN, cernlib-static-g77, no)
+            if test $CERNLIB_BIN = no; then
+                AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
+            fi
+            if test $CERNLIB_BIN = no; then
+                AC_PATH_PROG(CERNLIB_BIN, cernlib-g77, no)
+            fi
+            if test $CERNLIB_BIN = no; then
+                AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
+            fi
         fi
     else
         AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no, [$CERNLIB_BIN_PATH:$PATH])
@@ -98,7 +108,10 @@
     fi
 else
     if test "z$CERNLIB_PATH" = z; then
-         AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
+         AC_PATH_PROG(CERNLIB_BIN, cernlib-g77, no)
+         if test $CERNLIB_BIN = no; then
+            AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
+         fi
     else
          AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH])
          LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH"
@@ -159,6 +172,16 @@
 
 dnl now try the link
 LIBS="$CERNLIB_LIBS $LIBS"
+AC_LANG_PUSH(Fortran)
+AC_LINK_IFELSE([      program main
+      call $cern_func
+      end
+], 
+[ 
+    cernlib_lib_ok=yes
+]
+)
+AC_LANG_POP(Fortran)
 AC_LANG_PUSH(Fortran 77)
 AC_LINK_IFELSE([      program main
       call $cern_func
@@ -166,10 +189,11 @@
 ], 
 [ 
     cernlib_lib_ok=yes
-],
-[
+]
+)
+if test z"$cernlib_lib_ok" != 'zyes' ; then
     CERNLIB_LIBS=$save_CERNLIB_LIBS
-])
+fi
 AC_LANG_POP(Fortran 77)
 LIBS=$save_LIBS
 AC_SUBST([CERNLIB_LIBS])


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- cernlib.spec	26 Jun 2008 20:00:16 -0000	1.75
+++ cernlib.spec	1 Oct 2008 07:33:13 -0000	1.76
@@ -55,7 +55,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       30%{?dist}
+Release:       31%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -1435,6 +1435,9 @@
 %endif
 
 %changelog
+* Wed Oct  1 2008 Patrice Dumas <pertusus at free.fr> 2006-31
+- correct 702-patch-Imakefiles-for-packlib-mathlib to apply with fuzz 0
+
 * Thu Jun 26 2008 Patrice Dumas <pertusus at free.fr> 2006-30
 - debian paw 2.14.04.dfsg.2-6 patcheset