Mon Nov 28 10:43:26 UTC 2005

Author: pertusus

Update of /cvs/extras/rpms/cernlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21350

Modified Files:
	.cvsignore cernlib.README cernlib.spec sources 
Added Files:
	001-fix-missing-fluka.dpatch 002-fix-missing-mclibs.dpatch 
	700-remove-kernlib-from-packlib-Imakefile.dpatch 
	cernlib-cernlib_kernlib.patch cernlib-gxint-script.diff 
	cernlib-includelist.txt 
Removed Files:
	001-delete-pythia-refs 007-delete-fluka-refs 
	018-move-kernlib-to-toplevel cernlib-cernlib.patch 
	gxint-script.diff 
Log Message:
- use debian patches of the cernlib 2005 patchset for the files removal
- move kernlib out of packlib
- don't use includes.tar.gz, but instead get the include files from the
  sources

This removes include files with bad licence, and sync the file removal 
and include dirs handling with debian. There are still files with bad licence
but it should be easier to implement the debian fix once it is out.

--- NEW FILE 001-fix-missing-fluka.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 001-fix-missing-fluka.dpatch by  <kmccarty at princeton.edu>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Deal with FLUKA code having been purged from Debian's Cernlib source.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/geant321/Imakefile /tmp/dpep.yPljcw/cernlib-2005.05.09/src/geant321/Imakefile
--- cernlib-2005.05.09/src/geant321/Imakefile	1998-03-05 06:20:07.000000000 -0500
+++ /tmp/dpep.yPljcw/cernlib-2005.05.09/src/geant321/Imakefile	2005-06-08 15:32:20.735091925 -0400
@@ -4,7 +4,8 @@
 
 AllTarget(geant321)
 
-LIBDIRS= block cdf cgpack fiface fluka gbase gcons gdraw \ @@\
+/* Fluka removed from Debian source package for copyright reasons. */
+LIBDIRS= block cdf cgpack fiface       gbase gcons gdraw \ @@\
          geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
 	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
 	 miface miguti neutron peanut
@@ -25,9 +26,12 @@
 InstallLibrary(geant321,$(CERN_LIBDIR))
 InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
 
+/* Fluka removed from Debian source package for copyright reasons. */
+/*
 SubdirDataFile($(LIBRARY),flukaaf.dat,data)
 
 InstallNonExecFileTarget(install.lib,flukaaf.dat,$(CERN_LIBDIR))
+*/
 
 /* This will install the correct link for xsneut95.dat at CERN;
  * If you want a local copy of the file, just copy it there


--- NEW FILE 002-fix-missing-mclibs.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 002-fix-missing-mclibs.dpatch by  <kmccarty at princeton.edu>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Deal with several of the MC libs having to be purged from source.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/mclibs/Imakefile /tmp/dpep.pmIy0R/cernlib-2005.05.09/src/mclibs/Imakefile
--- cernlib-2005.05.09/src/mclibs/Imakefile	1999-05-20 09:30:20.000000000 -0400
+++ /tmp/dpep.pmIy0R/cernlib-2005.05.09/src/mclibs/Imakefile	2005-06-08 15:39:37.783591646 -0400
@@ -2,9 +2,11 @@
 #define IHaveSubdirs
 #define PassCDebugFlags
 
-
-LIBDIRS= ariadne cojets eurodec herwig fritiof \ @@\
-	 isajet jetset lepto63 pdf photos pythia
+/* Pythia and Jetset are not under GPL, so we must remove references
+   to them and their dependents.  They have already been purged from
+   Debianized source code.  Also, re-order libs so that dependent ones
+   come after dependees. */
+LIBDIRS= cojets eurodec pdf photos herwig isajet
 
 SUBDIRS = $(LIBDIRS)
 
@@ -12,8 +14,8 @@
 
 InstallLibSubdirs($(LIBDIRS))
 
-INCLUDEDIRS= ariadne cojets eurodec herwig fritiof \ @@\
-	 isajet jetset lepto63 pdf pythia
+/* Again, purge Pythia, Jetset and dependents. */
+INCLUDEDIRS= cojets eurodec herwig isajet pdf
 
 InstallIncludeSubdirs($(INCLUDEDIRS))
 


--- NEW FILE 700-remove-kernlib-from-packlib-Imakefile.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 700-remove-kernlib-from-packlib-Imakefile.dpatch by  <kmccarty at princeton.edu>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad cernlib-2005.05.09/src/Imakefile /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/Imakefile
--- cernlib-2005.05.09/src/Imakefile	2005-06-10 16:46:36.495568752 -0400
+++ /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/Imakefile	2005-06-10 16:50:33.508709032 -0400
@@ -2,7 +2,7 @@
 #define PassCDebugFlags
 
 
-LIBDIRS= packlib pawlib graflib mathlib geant321 mclibs phtools
+LIBDIRS= kernlib packlib pawlib graflib mathlib geant321 mclibs phtools
 
 SUBDIRS= $(LIBDIRS) patchy cfortran
 
@@ -23,5 +23,5 @@
 DelegateTarget(bin/kuipc,packlib)
 
 DelegateTarget(lib/packlib,packlib)
-DelegateTarget(lib/kernlib,packlib)
+DelegateTarget(lib/kernlib,kernlib)
 
diff -urNad cernlib-2005.05.09/src/packlib/Imakefile /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/packlib/Imakefile
--- cernlib-2005.05.09/src/packlib/Imakefile	1997-10-02 10:09:19.000000000 -0400
+++ /tmp/dpep.VNPUUt/cernlib-2005.05.09/src/packlib/Imakefile	2005-06-10 16:48:25.928085636 -0400
@@ -4,7 +4,7 @@
 
 
 LIBDIRS= cspack epio fatmen ffread hbook hepdb kapack kuip \ @@\
-	 minuit zbook zebra kernlib
+	 minuit zbook zebra
 
 SUBDIRS= $(LIBDIRS)
 
@@ -17,14 +17,10 @@
 
 TestSubdirs($(LIBDIRS))
 
-#ifndef CERNLIB_VAXVMS
-
-InstallLibSubdirs(kernlib)
-
-#else
+#ifdef CERNLIB_VAXVMS
 
 SUBDIRS := $(SUBDIRS) vmslibfiles
-InstallLibSubdirs(kernlib vmslibfiles)
+InstallLibSubdirs(vmslibfiles)
 
 #endif
 

cernlib-cernlib_kernlib.patch:

--- NEW FILE cernlib-cernlib_kernlib.patch ---
--- src/scripts/cernlib-orig	2005-11-24 13:51:54.000000000 +0100
+++ src/scripts/cernlib	2005-11-24 14:02:25.000000000 +0100
@@ -16,12 +16,16 @@
   [ -z "$CERN_LEVEL" ] && gver="pro" || gver="$CERN_LEVEL"
  
   _P=0  ; _p=0 ;   _u=0 ; Gsys=""
+  #default is to use dynamic lapack
+  _l=1 ;
+  dynlapack=0;
   while [ $# -gt 0 ]
   do case $1 in
        -G) Gsys=$2   ; shift ;;
        -P) _P=1              ;;
        -s) _s="is an obsolete option"     ;;
        -u) _u=1 ; _p=1       ;;
+       -l) _l=0              ;;
        -v) gver=$2   ; shift ;;
        --) shift ; break     ;;
         *)         break     ;;
@@ -46,14 +50,29 @@
       [ $# -eq 2 -a $1 != "graflib" ] && lver=$2
       dir=$CERN/$lver/lib
          ln=$1
-      if [ $1 = "kernlib" -o $1 = "packlib" ] ; then
+      if [ $1 = "kernlib" ]; then
          _p=1
       fi
+      if [ $1 = "packlib" ]; then
+         _p=1
+         ln="packlib.a $dir/libkernlib"
+      fi
          [ $1 = "genlib"  ] && ln="mathlib.a $dir/libphtools"
          [ $1 = "bvsl"    ] && ln="mathlib"
          [ $1 = "mpalib"  ] && ln="mathlib"
-         [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
-	 [ $1 = "pawlib"  ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
+         if [ $_l -eq 0 ] ; then
+           [ $1 = "pawlib"  ] && ln="pawlib.a $dir/liblapack3.a $dir/libblas"
+           [ $1 = "lapack"  ] && ln="lapack3.a $dir/libblas"
+         else
+           if [ $1 = "pawlib"  ] ; then 
+              ln="pawlib"
+              dynlapack=1
+           fi
+           if [ $1 = "lapack"  ] ; then
+              ln=""
+              dynlapack=1
+           fi
+         fi
          [ $1 = "pythia"  ] && ln="jetset"
       if [ $1 = "GKS" -o $1 = "gks" ] ; then
          drv="X11" ; glib="$1" ; dir="$CERN/gks/$lver/lib"
@@ -69,9 +88,9 @@
          [ $drv = "Motif" ] && drv="X11"
          ln="$ln.a $dir/libgraf$drv"
       fi
-         CERNLIB="$CERNLIB $dir/lib$ln.a"
+      [ -n "$ln" ] && CERNLIB="$CERNLIB $dir/lib$ln.a"
   done
-  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a"
+  [ $_p -eq 0 ] && CERNLIB="$CERNLIB $CERN/$gver/lib/libpacklib.a $CERN/$gver/lib/libkernlib.a"
 
 #  get system name
   [ -d /NextAdmin ] && Msys="NeXT" || Msys=`uname -s`
@@ -113,7 +132,9 @@
       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/lib64 ] && SYSGX11="-L/usr/X11R6/lib64 -lX11"
 	       [ -d /usr/X11R6/lib ] && SYSGMOTIF="-L/usr/X11R6/lib -lXm -lXt -lXp -lXext -lX11"
+	       [ -d /usr/X11R6/lib64 ] && SYSGMOTIF="-L/usr/X11R6/lib64 -lXm -lXt -lXp -lXext -lX11"
 	       [ `uname -m` = ppc ] && SYSGMOTIF="$SYSGMOTIF -lSM -lICE -lXpm"
 	       ;;
       NeXT)    SYSGX11="/usr/lib/X11/libX11.r" ;
@@ -208,6 +229,10 @@
      fi
      if [ "$Msys" = "Linux" ] ; then
         CERNLIB="$CERNLIB -lnsl -lcrypt -ldl"
+#        echo $CERNLIB | grep pawlib >/dev/null &&   CERNLIB="$CERNLIB -llapack -lblas"
+     fi
+     if [ $dynlapack = 1 ] ; then
+         CERNLIB="$CERNLIB -llapack -lblas"
      fi
   fi
  

cernlib-gxint-script.diff:

--- NEW FILE cernlib-gxint-script.diff ---
--- src/scripts/gxint.orig	2005-06-12 14:12:21.183392960 +0200
+++ src/scripts/gxint	2005-06-12 14:14:52.733353864 +0200
@@ -78,7 +78,7 @@
      fi
   fi
  
-drv="/X11" ; ver="pro" ; OUT="${HOME}/GEANT$$"
+drv="/X11" ; ver="==VERSION==" ; OUT="${HOME}/GEANT$$"
 gxint=""
  
 while [ $# -gt 0 ]
@@ -142,7 +142,8 @@
  
 CLIB="geant${gvs} pawlib graflib$drv packlib mathlib"
  
-[ -z "$_m" ] && gxint="${CERN}/${ver}/lib/gxint${gvs}.$_o" 
+#[ -z "$_m" ] && gxint="${CERN}/${ver}/lib/gxint${gvs}.$_o" 
+[ -z "$_m" ] && gxint="==includedir==/cernlib/${ver}/gxint${gvs}.f" 
  
 cat << EoD
 $line


--- NEW FILE cernlib-includelist.txt ---
geant321/geant321
graflib/dzdoc/dzdoc
graflib/higz/higz
graflib/hplot/hplot
kernlib/kernbit/kernbit
kernlib/kerngen/kerngen
kernlib/kernnum/kernnum
mathlib/gen/gen
mclibs/cojets/cojets
mclibs/eurodec/eurodec
mclibs/herwig/herwig59
mclibs/isajet/isajet
mclibs/pdf/pdf
packlib/cspack/cspack
packlib/epio/epio
packlib/fatmen/fatmen
packlib/ffread/ffread
packlib/hbook/hbook
packlib/hepdb/hepdb
packlib/kapack/kapack
packlib/kuip/kuip
packlib/minuit/minuit
packlib/zbook/zbook
packlib/zebra/zebra
pawlib/comis/comis
pawlib/paw/ntuple
pawlib/paw/paw
pawlib/sigma/sigma


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Nov 2005 21:59:26 -0000	1.3
+++ .cvsignore	28 Nov 2005 10:43:24 -0000	1.4
@@ -1,16 +1,15 @@
-include.tar.gz
-src_Imakefile.tar.gz
 src_car.tar.gz
+src_Imakefile.tar.gz
+src_patchy.tar.gz
 src_cfortran.tar.gz
-src_config.tar.gz
-src_geant321.tar.gz
-src_graflib.tar.gz
 src_include.tar.gz
-src_mathlib.tar.gz
-src_mclibs.tar.gz
-src_packlib.tar.gz
-src_patchy.tar.gz
 src_pawlib.tar.gz
+src_config.tar.gz
+src_mathlib.tar.gz
 src_phtools.tar.gz
+src_geant321.tar.gz
+src_mclibs.tar.gz
 src_scripts.tar.gz
+src_graflib.tar.gz
+src_packlib.tar.gz
 xsneut95.dat


Index: cernlib.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib.README	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib.README	28 Nov 2005 10:43:24 -0000	1.2
@@ -48,3 +48,9 @@
 
 The cernlib script has been modified to use an external lapack and not
 the one provided with the cernlib.
+
+5) kernlib out of packlib
+
+kernlib has been moved outside of packlib. If you use the cernlib script
+for linking it should be taken into account, however if you link directly
+with packlib you could need to add the kernlib on your link command line.


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cernlib.spec	21 Nov 2005 23:14:38 -0000	1.9
+++ cernlib.spec	28 Nov 2005 10:43:24 -0000	1.10
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       4%{?dist}.7
+Release:       4%{?dist}.8
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -33,8 +33,7 @@
 # not used during the build (if I'm not wrong)
 Source15: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_car.tar.gz
 # unmodified files
-Source0: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/include.tar.gz
-Source1: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_config.tar.gz
+Source0: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_config.tar.gz
 Source2: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_Imakefile.tar.gz
 Source5: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_include.tar.gz
 Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz 
@@ -56,6 +55,8 @@
 Source103: cernlib.README
 # mkdirhier is used to create directories. Taken from xorg-x11
 Source104: mkdirhier
+# list of include directories (includelist.txt from debian)
+Source105: cernlib-includelist.txt
 # Files that can be used in the SOURCE directory to remove files with
 # GPL incompatible licences from upstream sources
 Source200: cernlib-remove-deadpool
@@ -63,13 +64,17 @@
 
 # change the cernlib script such that -llapack -lblas is used instead of 
 # cernlib lapack
-Patch: cernlib-cernlib.patch
+# and also depend explicitely on libkernlib now that it is out of packlib
+Patch49: cernlib-cernlib_kernlib.patch
+
 # debian cernlib patch full of good things
-Patch1: cernlib_2004.11.04-3.diff
+Patch0: cernlib_2004.11.04-3.diff
+Patch1: 001-fix-missing-fluka.dpatch
+Patch2: 002-fix-missing-mclibs.dpatch
 # modified, to have only DATADIR
-Patch2: 003-enforce-FHS
-Patch3: 005-enable-shadow-passwd
-Patch4: 007-delete-fluka-refs
+Patch3: 003-enforce-FHS
+Patch4: 005-enable-shadow-passwd
+#Patch4: 007-delete-fluka-refs
 Patch5: 008-undef-PPC
 Patch6: 010-comis-allow-special-chars-in-path
 Patch7: 012-add-no-optimization-macro
@@ -78,8 +83,7 @@
 # not applied, requires debian imake rules
 Patch9: 014-fix-herwig-imakefile-special-rules
 Patch11: 015-fix-optimization
-# not applied, break build
-Patch12: 018-move-kernlib-to-toplevel
+Patch12: 700-remove-kernlib-from-packlib-Imakefile.dpatch
 Patch13: 022-no-assign-string-literals
 # fixed upstream
 Patch14: 027-use-tmpfile-not-mktemp
@@ -102,9 +106,9 @@
 # fixed upstream
 Patch28: 051-fix-miscellaneous-tmp-uses
 # extracted from 001-enable-shared-libs
-Patch29: 001-delete-pythia-refs
+#Patch29: 001-delete-pythia-refs
 # prepare gxint for substitutions of path and version
-Patch30: gxint-script.diff
+Patch30: cernlib-gxint-script.diff
 Patch31: cernlib-XmDrawShadow-no-prototype.patch
 Patch32: cernlib-install_scripts.patch
 Patch33: cernlib-static-tcpaw.diff
@@ -210,7 +214,6 @@
 
 %prep
 %setup -c 
-%setup -T -D -a 1
 %setup -T -D -a 2
 %setup -T -D -a 3
 %setup -T -D -a 4
@@ -225,19 +228,19 @@
 %setup -T -D -a 14
 %setup -T -D -a 15
 
-%patch -P 1 -p1
+%patch -p1
 cd %{version}
-%patch 
-%patch -P 2 -p2
+%patch -P 1 -p1
+%patch -P 2 -p1
 %patch -P 3 -p2
-%patch -P 4
+%patch -P 4 -p2
 %patch -P 5
 %patch -P 6
 %patch -P 7
 #%patch -P 8
 #%patch -P 9
 %patch -P 11
-#%patch -P 12
+%patch -P 12 -p1
 %patch -P 13
 #%patch -P 14
 %patch -P 15
@@ -254,7 +257,8 @@
 #%patch -P 26 
 #%patch -P 27 
 #%patch -P 28 
-%patch -P 29
+# not needed anymore
+#%patch -P 29
 %patch -P 30
 %patch -P 31
 %patch -P 32
@@ -272,6 +276,7 @@
 %patch -P 46
 %patch -P 47
 %patch -P 48
+%patch -P 49
 
 
 %build
@@ -302,20 +307,23 @@
 
 cd $CERN_ROOT
 
+find . -type d -name CVS -depth -exec rm -rf {} ';' 
+
 # substitude the right defaults in the cernlib script
 sed -i -e 's:/cern:%{_libdir}/cernlib/:' -e 's:pro:%{version}:' src/scripts/cernlib
 
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS
-sed -e 's/==VERSION==/%{version}/' -e 's:==includedir==:%{_includedir}:' src/scripts/gxint > src/scripts/gxint.new
-cp src/scripts/gxint.new src/scripts/gxint
+sed -i -e 's/==VERSION==/%{version}/' -e 's:==includedir==:%{_includedir}:' src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
 for file in src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F; do
-  cp $file $file.bef
-  sed -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' $file.bef > $file
+  sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' $file
 done
 
+# move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch)
+mv src/packlib/kernlib src/kernlib
+
 # Create the build directory structure
 
 mkdir -p build bin lib build/log
@@ -359,7 +367,7 @@
 %{__install} -m755 cernlib-%{version}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 %{__install} -d -m755 cfortran/Examples
-%{__install} -m644 %{version}/include/cfortran/Examples/*.c cfortran/Examples/
+%{__install} -m644 %{version}/src/cfortran/Examples/*.c cfortran/Examples/
 
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_datadir}/aclocal
 %{__install} -m644 cernlib.m4 $RPM_BUILD_ROOT%{_datadir}/aclocal/cernlib.m4
@@ -368,20 +376,37 @@
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_datadir}/cernlib/%{version}
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
+%{__install} -d -m755 $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/cfortran
 %{__install} -d -m755 $RPM_BUILD_ROOT%{_bindir}/
 
 %{__install} -m644 lib/*.dat $RPM_BUILD_ROOT%{_datadir}/cernlib/%{version}
 %{__install} -m644 lib/gxint321.f $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
-(cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && %{__ln_s} gxint321.f gxint.f)
+%{__install} -m644 src/cfortran/*.h $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/
 
 %{__install} -m755 bin/* $RPM_BUILD_ROOT%{_bindir}/
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
-(cd include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -)
-
-rm -rf $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/cfortran/Examples/
+#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -)
+ 
 rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier
 
+pushd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
+for file in *.h; do
+	%{__ln_s} $file cfortran/$file
+done
+%{__ln_s} gxint321.f gxint.f
+popd
+
+cd src
+base_include=$RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}
+for dir in `cat %{SOURCE105}`; do
+	basedir=`basename $dir`
+	rm -rf $base_include/$basedir
+	cp -Rp $dir $base_include/
+done
+
+find $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} -name Imakefile -exec rm -f \{\} \;
+#rm -rf $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version}/cfortran/Examples/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -443,6 +468,12 @@
 %doc debian/zftp.README.debian
 
 %changelog
+* Fri Nov 25 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.8
+- use debian patches of the cernlib 2005 patchset for the files removal
+- move kernlib out of packlib
+- don't use includes.tar.gz, but instead get the include files from the
+  sources
+
 * Mon Nov 21 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.7
 - add debian patch for MacOSX that could have fixed the PPC build
 - add associated patch for use of regcomp instead of regcmp


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Nov 2005 21:59:26 -0000	1.3
+++ sources	28 Nov 2005 10:43:24 -0000	1.4
@@ -1,16 +1,15 @@
-cdbd82c54aed8d1385f1ef0a10be8667  include.tar.gz
-03bfd1239e57a23ab087bf29fe48c8a8  src_Imakefile.tar.gz
 1f25e16563f89a69c1b15b8ed11af904  src_car.tar.gz
+03bfd1239e57a23ab087bf29fe48c8a8  src_Imakefile.tar.gz
+fd20e80b3f58fc88168bcd6ce701f999  src_patchy.tar.gz
 9e686519ae3a52344222b21c9444ddd6  src_cfortran.tar.gz
-b72b89cb3a7f7c592d28b992c95b4eff  src_config.tar.gz
-2cf91d533315b430f4e36c1c6e23841a  src_geant321.tar.gz
-f09d0f28e5c7ecc1a3932369f5a15dab  src_graflib.tar.gz
 9ebd72a2b6e5349b25fc93e7b20c172a  src_include.tar.gz
-0ec66e6d4920af79999b4c73fd3b065a  src_mathlib.tar.gz
-ce6d941a50c3e1fdc8bdcc4ec2988116  src_mclibs.tar.gz
-d7d4628d136ed97f1e9ba164774a6878  src_packlib.tar.gz
-fd20e80b3f58fc88168bcd6ce701f999  src_patchy.tar.gz
 dcd46166a57a8a4ec45d872d79839f1a  src_pawlib.tar.gz
+b72b89cb3a7f7c592d28b992c95b4eff  src_config.tar.gz
+0ec66e6d4920af79999b4c73fd3b065a  src_mathlib.tar.gz
 f215b9adba3cfb3be4bd74d624f00d32  src_phtools.tar.gz
+2cf91d533315b430f4e36c1c6e23841a  src_geant321.tar.gz
+ce6d941a50c3e1fdc8bdcc4ec2988116  src_mclibs.tar.gz
 b30b121167ddf6508c22fc25a4272276  src_scripts.tar.gz
+f09d0f28e5c7ecc1a3932369f5a15dab  src_graflib.tar.gz
+d7d4628d136ed97f1e9ba164774a6878  src_packlib.tar.gz
 eecb52159458ead0ee6b0d00b90aab66  xsneut95.dat


--- 001-delete-pythia-refs DELETED ---


--- 007-delete-fluka-refs DELETED ---


--- 018-move-kernlib-to-toplevel DELETED ---


--- cernlib-cernlib.patch DELETED ---


--- gxint-script.diff DELETED ---


