[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/cernlib/devel cernlib-script.patch, 1.1, 1.2 cernlib.spec, 1.54, 1.55



Author: pertusus

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

Modified Files:
	cernlib-script.patch cernlib.spec 
Log Message:
* Wed May 23 2007 Patrice Dumas <pertusus at free.fr> 2006-12
- remove reference to %{_libdir} and X11R6 path in cernlib script
- apply cernlib-static script patch
- add packlib-lesstif only if Motif driver is selected. This driver
  is selected in the default case for geant321, packlib and pawlib
- build and ship the graflib utilities


cernlib-script.patch:

Index: cernlib-script.patch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-script.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-script.patch	21 Apr 2007 14:35:24 -0000	1.1
+++ cernlib-script.patch	23 May 2007 20:27:34 -0000	1.2
@@ -1,5 +1,5 @@
 --- cernlib-2006/2006/src/scripts/cernlib.script	2006-12-07 14:26:55.000000000 +0100
-+++ cernlib-2006/2006/src/scripts/cernlib	2007-04-14 01:01:49.000000000 +0200
++++ cernlib-2006/2006/src/scripts/cernlib	2007-05-23 09:15:43.000000000 +0200
 @@ -16,12 +16,17 @@
    [ -z "$CERN_LEVEL" ] && gver="pro" || gver="$CERN_LEVEL"
   
@@ -18,7 +18,7 @@
         -v) gver=$2   ; shift ;;
         --) shift ; break     ;;
          *)         break     ;;
-@@ -46,14 +51,35 @@
+@@ -46,14 +51,38 @@
        [ $# -eq 2 -a $1 != "graflib" ] && lver=$2
        dir=$CERN/$lver/lib
           ln=$1
@@ -26,9 +26,13 @@
 +      if [ $1 = "kernlib" ]; then
           _p=1
        fi
-+      if [ $1 = "packlib" ]; then
++      if [ $1 = "packlib" -o $1 = "packlib-lesstif" ]; then
 +         _p=1
-+         ln="packlib-lesstif.a $dir/libpacklib.a $dir/libkernlib"
++         ln="packlib.a $dir/libkernlib"
++         [ $1 = "packlib-lesstif" -o z"$Gsys" = 'zMotif' ] && ln="packlib-lesstif.a $dir/lib$ln"
++      fi
++
++      if [ $1 = "geant321" -o $1 = "pawlib" -o $1 = "packlib-lesstif" ]; then
 +         [ -z "$Gsys" ] && Gsys="Motif"
 +      fi
           [ $1 = "genlib"  ] && ln="mathlib.a $dir/libphtools"
@@ -45,7 +49,6 @@
 +         else
 +           if [ $1 = "pawlib"  ] ; then 
 +              ln="pawlib-lesstif.a $dir/libpawlib"
-+              [ -z "$Gsys" ] && Gsys="Motif"
 +              dynxbae=1
 +              dynlapack=1
 +           fi
@@ -57,7 +60,7 @@
           [ $1 = "pythia"  ] && ln="jetset"
        if [ $1 = "GKS" -o $1 = "gks" ] ; then
           drv="X11" ; glib="$1" ; dir="$CERN/gks/$lver/lib"
-@@ -69,10 +95,12 @@
+@@ -69,10 +98,14 @@
           [ $drv = "Motif" ] && drv="X11"
           ln="$ln.a $dir/libgraf$drv"
        fi
@@ -67,13 +70,15 @@
 -  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a"
 -
 +  if [ $_p -eq 0 ]; then 
-+       CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib-lesstif.a $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
-+       [ -z "$Gsys" ] && Gsys="Motif"
++       if [ z"$Gsys" = "zMotif" ]; then
++           CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib-lesstif.a"
++       fi
++       CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
 +  fi
  #  get system name
    [ -d /NextAdmin ] && Msys="NeXT" || Msys=`uname -s`
    case $Msys in
-@@ -81,7 +109,6 @@
+@@ -81,7 +114,6 @@
                  ;;
            *)    ;;
    esac
@@ -81,24 +86,20 @@
   
    if [ -n "$Gsys" ] ; then
       case $Msys in
-@@ -110,10 +137,14 @@
+@@ -110,10 +142,8 @@
                 SYSGGL="-lfgl -lgl_s -lm -lbsd" ;
                 SYSGMOTIF="-lXm -lXt -lX11 -lPW"
  	       ;;
 -      Linux)   [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
+-	       [ -d /usr/X11/lib ] && SYSGX11="-L/usr/X11/lib -lX11"
+-	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
+-	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
 +      Linux)   SYSGX11="-lX11"
 +	       SYSGMOTIF="-lXm -lXt -lXp -lXext -lX11"
-+	       [ -d /usr/X386/lib ] && SYSGX11="-L/usr/X386/lib -lX11"
- 	       [ -d /usr/X11/lib ] && SYSGX11="-L/usr/X11/lib -lX11"
- 	       [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
--	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
-+	       [ -d /usr/X11R6/lib64 ] && SYSGX11="-L/usr/X11R6/lib64 -lX11"
-+	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib $SYSGMOTIF"
-+	       [ -d /usr/X11R6/lib64 ] && SYSGMOTIF="-L/usr/X11R6/lib64 $SYSGMOTIF"
  	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
  	       ;;
        Darwin)  [ -d /usr/X11R6/lib ] && SYSGX11="-L/usr/X11R6/lib -lX11"
-@@ -150,7 +181,11 @@
+@@ -150,7 +180,11 @@
                 SYSGMOTIF="-L/usr/lib/X11 -lXm -lXt -lX11 -lm" ;;
       esac
   
@@ -110,7 +111,7 @@
       case $Gsys in
         X11) CERNLIB="$CERNLIB $SYSGX11" ;;
       Motif) [ -z "$SYSGMOTIF" ] && SYSGMOTIF="-lXm -lXt $SYSGX11" ;
-@@ -212,6 +247,9 @@
+@@ -212,6 +246,9 @@
       if [ "$Msys" = "Linux" ] ; then
          CERNLIB="$CERNLIB -lnsl -lcrypt -ldl"
       fi


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- cernlib.spec	14 May 2007 12:02:40 -0000	1.54
+++ cernlib.spec	23 May 2007 20:27:34 -0000	1.55
@@ -17,7 +17,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       11%{?dist}
+Release:       12%{?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.
@@ -449,6 +449,8 @@
 %patch -P 1503
 %patch -P 1507 -p1 -b .use_OPT
 
+# adapt static script to modular X, use system libs and follow debian split
+%patch -P 1200 -p1 -b .script
 # patches for man page
 %patch -P 1206 -p1 -b .man_static
 
@@ -723,8 +725,10 @@
 cd $CERN_ROOT
 
 # substitude the right defaults in the scripts
+sed -i.paths -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
+   src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
+
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
-   src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script \
    ../patchy/ylist ../patchy/yindex
 
 # substitute version in gxint with the right version
@@ -743,19 +747,27 @@
 # Create the build directory structure
 mkdir -p build bin lib shlib
 
-# rename the cernlib script cernlib-static and use the debian cernlib
-# script for dynamic libraries support
-# remove -lg2c to the link commands, because libg2c.so isn't available, 
-# it is found by g77/gfortran if needed
+# rename the cernlib script cernlib-static
 mv src/scripts/cernlib src/scripts/cernlib-static
 %{__install} -p -m755 src/scripts/cernlib-static bin/cernlib-static
+
+# use the debian cernlib script for dynamic libraries support.
+# remove -lg2c to the link commands, because libg2c.so isn't available, 
+# it is found by g77/gfortran if needed.
+# don't add %{_libdir} to the directory searched in for libraries, 
+# since it is already in the list.
+# also remove use of /usr/X11R6/lib*.
 sed -e 's:@PREFIX@:%{_prefix}:g' \
   -e 's:@CERN@:%{_libdir}/cernlib:g' \
   -e 's:@VERSION@:%{verdir}:g' \
-  -e 's:@LIBPREFIX@:%{_libdir}:g' \
+  -e 's:@LIBPREFIX@::g' \
   -e 's/-lg2c//' \
+  -e 's/-L\$XDIR\(64\)\? //' \
+  -e 's:-L/usr/X11R6/lib\(64\)\? ::' \
+  -e 's:/usr/X11R6/lib\(64\)\? ::g' \
   ../cernlib.in > src/scripts/cernlib
 chmod 0755 src/scripts/cernlib
+touch -r ../cernlib.in src/scripts/cernlib
 
 # install mkdirhier which is needed to make directories
 %{__install} -p -m755 %{SOURCE104} bin/
@@ -832,6 +844,9 @@
 cd $CERN_ROOT/build/packlib
 make %{?_smp_mflags} install.bin
 
+cd $CERN_ROOT/build/graflib
+make %{?_smp_mflags} install.bin
+
 # bootstrap npatchy
 mkdir -p $CERN_ROOT/build/p5boot
 cd $CERN_ROOT/build/p5boot
@@ -1083,6 +1098,8 @@
 %doc cernlib-2006.dfsg.2/debian/debhelper/zftp.README.debian
 %{_bindir}/cdbackup%{?compiler}
 %{_bindir}/cdserv%{?compiler}
+%{_bindir}/dzedit%{?compiler}
+%{_bindir}/dzeX11%{?compiler}
 %{_bindir}/fatmen%{?compiler}
 %{_bindir}/fatsrv%{?compiler}
 %{_bindir}/kuesvr%{?compiler}
@@ -1133,6 +1150,13 @@
 
 
 %changelog
+* Wed May 23 2007 Patrice Dumas <pertusus at free.fr> 2006-12
+- remove reference to %%{_libdir} and X11R6 path in cernlib script
+- apply cernlib-static script patch
+- add packlib-lesstif only if Motif driver is selected. This driver
+  is selected in the default case for geant321, packlib and pawlib
+- build and ship the graflib utilities
+
 * Mon May 14 2007 Patrice Dumas <pertusus at free.fr> 2006-11
 - disable the same tests on ppc64 than on x86_64
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]