Wed Feb 27 01:05:08 UTC 2008

Author: pertusus

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

Modified Files:
	.cvsignore 210-improve-cfortran-header-files.dpatch 
	802-create-shared-libraries.dpatch cernlib.spec 
	geant321-001-fix-missing-fluka.dpatch 
	geant321-003-geant-dummy-functions.dpatch 
	geant321-203-compile-geant-with-ertrak.dpatch 
	geant321-806-bump-mathlib-and-dependents-sonames.dpatch 
	geant321-807-static-link-some-tests-on-64-bit.dpatch 
	mclibs-806-bump-mathlib-and-dependents-sonames.dpatch 
	mclibs-807-static-link-some-tests-on-64-bit.dpatch sources 
Added Files:
	mclibs-220-compile-isajet-with-isarun.dpatch 
	mclibs-221-use-double-in-hepevt.dpatch 
Log Message:
* Tue Feb 26 2008 Patrice Dumas <pertusus at free.fr> 2006-26
- new mclibs and geant321 patchsets

--- NEW FILE mclibs-220-compile-isajet-with-isarun.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 220-compile-isajet-with-isarun.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Compile isajet library including isaset() function.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/isajet/isajet/pilot.h mclibs-2006.dfsg.2/src/mclibs/isajet/isajet/pilot.h
--- mclibs-2006.dfsg.2~/src/mclibs/isajet/isajet/pilot.h	2001-10-08 06:16:58.000000000 -0700
+++ mclibs-2006.dfsg.2/src/mclibs/isajet/isajet/pilot.h	2008-02-06 12:52:46.000000000 -0800
@@ -41,3 +41,6 @@
 #ifndef CERNLIB_MOVEFTN
 #define CERNLIB_MOVEFTN
 #endif
+#ifndef CERNLIB_INTERACT
+#define CERNLIB_INTERACT
+#endif


--- NEW FILE mclibs-221-use-double-in-hepevt.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 221-use-double-in-hepevt.dpatch by Kevin B. McCarty <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use double-precision values in hepevt.inc.

@DPATCH@
diff -urNad mclibs-2006.dfsg.2~/src/mclibs/isajet/isajet/hepevt.inc mclibs-2006.dfsg.2/src/mclibs/isajet/isajet/hepevt.inc
--- mclibs-2006.dfsg.2~/src/mclibs/isajet/isajet/hepevt.inc	1998-04-02 06:47:34.000000000 -0800
+++ mclibs-2006.dfsg.2/src/mclibs/isajet/isajet/hepevt.inc	2008-02-06 12:56:20.000000000 -0800
@@ -9,7 +9,7 @@
       COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
      $JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
       INTEGER NEVHEP,NHEP,ISTHEP,IDHEP,JMOHEP,JDAHEP
-      REAL PHEP,VHEP
+      DOUBLE PRECISION PHEP,VHEP
       SAVE /HEPEVT/
 C...      NEVHEP       - event number
 C...      NHEP         - number of entries in this event


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Feb 2008 00:56:31 -0000	1.10
+++ .cvsignore	27 Feb 2008 01:04:28 -0000	1.11
@@ -1,6 +1,6 @@
 2006_src-free.tar.gz
 patchy.tar.gz
-geant321_3.21.14.dfsg-6.diff.gz
-mclibs_2006.dfsg.2-3.diff.gz
+geant321_3.21.14.dfsg-7.diff.gz
+mclibs_2006.dfsg.2-5.diff.gz
 paw_2.14.04.dfsg.2-2.diff.gz
 cernlib_2006.dfsg.2-11.diff.gz


Index: 210-improve-cfortran-header-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/210-improve-cfortran-header-files.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 210-improve-cfortran-header-files.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 210-improve-cfortran-header-files.dpatch	27 Feb 2008 01:04:28 -0000	1.2
@@ -3,7 +3,7 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Protect against multiple inclusion and add explicit dependency on
-## DP: cfortran.h to the Cernlib C headers.
+## DP: cfortran.h to the CERNLIB C headers.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09/src/cfortran/comis.h /tmp/dpep.Al0dBQ/cernlib-2005.05.09/src/cfortran/comis.h


Index: 802-create-shared-libraries.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/802-create-shared-libraries.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 802-create-shared-libraries.dpatch	2 Dec 2005 09:57:41 -0000	1.2
+++ 802-create-shared-libraries.dpatch	27 Feb 2008 01:04:28 -0000	1.3
@@ -42,7 +42,7 @@
  InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
 +InstallSharedLibrary(geant321,$(LIB_SONAME).$(CERN_LEVEL),$(CERN_SHLIBDIR))
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */
  /*
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gparal/Imakefile
 --- cernlib-2005.05.09.dfsg~/src/geant321/gparal/Imakefile	1996-12-19 14:19:18.000000000 +0000


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- cernlib.spec	25 Feb 2008 00:56:31 -0000	1.69
+++ cernlib.spec	27 Feb 2008 01:04:28 -0000	1.70
@@ -55,7 +55,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       25%{?dist}
+Release:       26%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -140,8 +140,8 @@
 # debian patchsets
 Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-11.diff.gz
 Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-2.diff.gz
-Patch100003: http://ftp.de.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-3.diff.gz
-Patch100004: http://ftp.de.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-6.diff.gz
+Patch100003: http://ftp.de.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-5.diff.gz
+Patch100004: http://ftp.de.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-7.diff.gz
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: geant321-001-fix-missing-fluka.dpatch
@@ -219,6 +219,8 @@
 #Patch215: cernlib-215-work-around-g77-bug-on-ia64.dpatch
 Patch216: cernlib-216-use-cernlib-gamma-not-intrinsic.dpatch
 Patch217: cernlib-217-abend-on-mathlib-test-failure.dpatch
+Patch220: mclibs-220-compile-isajet-with-isarun.dpatch
+Patch221: mclibs-221-use-double-in-hepevt.dpatch
 Patch300: cernlib-300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -619,6 +621,8 @@
 #%patch -P 215 -p1
 %patch -P 216 -p1
 %patch -P 217 -p1
+%patch -P 220 -p1
+%patch -P 221 -p1
 %patch -P 300 -p1
 #%patch -P 301 -p1
 #%patch -P 302 -p1
@@ -831,11 +835,18 @@
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{verdir}":' \
    ../patchy/ylist ../patchy/yindex
 
+%if %{with gfortran}
+FC_COMPILER=gfortran
+%else
+FC_COMPILER=g77
+%endif
+
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
 # and substitue the name of the cernlib link script
 sed -i -e 's/"pro"/%{version}/' -e 's:\${CERN}/\${ver}/lib/gxint\${gvs}\.\$_o:%{_includedir}/cernlib/\${ver}/gxint.f:' \
   -e 's/`cernlib /`cernlib%{?compiler} /' \
+  -e 's/"f77"/"'$FC_COMPILER'"/' \
   src/scripts/gxint 
 
 # substitute DATADIR in source files to conform to FHS
@@ -1431,6 +1442,9 @@
 %endif
 
 %changelog
+* Tue Feb 26 2008 Patrice Dumas <pertusus at free.fr> 2006-26
+- new mclibs and geant321 patchsets
+
 * Sun Feb 24 2008 Patrice Dumas <pertusus at free.fr> 2006-25
 - new cernlib and paw patchsets
 


Index: geant321-001-fix-missing-fluka.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/geant321-001-fix-missing-fluka.dpatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geant321-001-fix-missing-fluka.dpatch	9 Jan 2008 23:55:25 -0000	1.3
+++ geant321-001-fix-missing-fluka.dpatch	27 Feb 2008 01:04:28 -0000	1.4
@@ -2,7 +2,7 @@
 ## 001-fix-missing-fluka.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Deal with FLUKA code having been purged from Debian's Cernlib source.
+## DP: Deal with FLUKA code having been purged from Debian's CERNLIB source.
 
 @DPATCH@
 diff -urNad geant321-3.21.14.dfsg~/src/geant321/Imakefile geant321-3.21.14.dfsg/src/geant321/Imakefile
@@ -13,7 +13,7 @@
  AllTarget(geant321)
  
 -LIBDIRS= block cdf cgpack fiface fluka gbase gcons gdraw \ @@\
-+/* Fluka removed from Debian source package for copyright reasons. */
++/* FLUKA removed from Debian source package for copyright reasons. */
 +LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
           geocad ggeom gheisha ghits ghrout ghutils giface \ @@\
  	 giopa gkine gphys gscan gstrag gtrak guser gxint \ @@\
@@ -26,7 +26,7 @@
  InstallLibrary(geant321,$(CERN_LIBDIR))
  InstallLibraryAlias(geant321,geant,$(CERN_LIBDIR))
  
-+/* Fluka removed from Debian source package for copyright reasons. */
++/* FLUKA removed from Debian source package for copyright reasons. */
 +/*
  SubdirDataFile($(LIBRARY),flukaaf.dat,data)
  


Index: geant321-003-geant-dummy-functions.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/geant321-003-geant-dummy-functions.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-003-geant-dummy-functions.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ geant321-003-geant-dummy-functions.dpatch	27 Feb 2008 01:04:28 -0000	1.2
@@ -2,7 +2,7 @@
 ## 003-geant-dummy-functions.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add stub Geant functions to avoid missing symbols due to Fluka removal.
+## DP: Add stub GEANT functions to avoid missing symbols due to FLUKA removal.
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/geant321/gkine/Imakefile cernlib-2005.05.09.dfsg/src/geant321/gkine/Imakefile
@@ -12,7 +12,7 @@
  SRCS_F= gfkine.F gfvert.F gludky.F glund.F glundi.F gpkine.F \ @@\
  	gpkinx.F gpvert.F gskine.F gskinu.F gsvert.F gsveru.F gtau.F
  
-+/* Dummy file containing stubs for deleted Fluka and mclibs functions: */
++/* Dummy file containing stubs for deleted FLUKA and mclibs functions: */
 +SRCS_C= dummy.c
 +
  #ifdef CERNLIB_QMVAOS
@@ -47,7 +47,7 @@
 +
 +static void print_dummy(const char *domain, const char *function)
 +{
-+  fprintf(stderr, "Geant321: Now in dummy %s routine.\n", function);
++  fprintf(stderr, "GEANT 3.21: Now in dummy %s routine.\n", function);
 +  fprintf(stderr,
 +"If you see this message, you are presumably trying to call (possibly\n"
 +"indirectly) the %s routine");
@@ -64,7 +64,7 @@
 +  else if (strcmp(domain, "Fluka") == 0)
 +    fprintf(stderr,
 +" in the FLUKA library.\n"
-+"FLUKA is unfortunately not available in this distribution of Cernlib for\n"
++"FLUKA is unfortunately not available in this distribution of CERNLIB for\n"
 +"licensing reasons"
 +#if defined (CERNLIB_DEBIAN)
 +"; please see the file /usr/share/doc/geant321/README.Debian\n"
@@ -75,7 +75,7 @@
 +    );
 +  
 +  else if (strcmp(domain, "User") == 0)
-+    fprintf(stderr, ".  This routine is not built into Geant;\n"
++    fprintf(stderr, ".  This routine is not built into GEANT;\n"
 +"you must write code for it yourself.  Please see the documentation"
 +#if defined (CERNLIB_DEBIAN)
 +"\n(for instance in the geant321-doc package)"
@@ -118,7 +118,7 @@
 +WEAKDUMMY(Fluka, SITSAO, sitsao_, double);
 +
 +/* The following dummy functions are added due to the removal
-+ * of the corresponding code from Geant (it is also part of FLUKA).
++ * of the corresponding code from GEANT (it is also part of FLUKA).
 + * We are constrained to keep the ABI for the dynamic library, so
 + * these dummy functions must be kept until next time the libgeant321
 + * soversion is changed. */


Index: geant321-203-compile-geant-with-ertrak.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/geant321-203-compile-geant-with-ertrak.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-203-compile-geant-with-ertrak.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ geant321-203-compile-geant-with-ertrak.dpatch	27 Feb 2008 01:04:28 -0000	1.2
@@ -11,7 +11,7 @@
 @@ -5,11 +5,12 @@
  AllTarget(geant321)
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */
 +/* Ertrak added to Debian since I saw no reason to leave it out. */
  LIBDIRS=       cdf cgpack              gbase gcons gdraw \ @@\
           geocad ggeom gheisha ghits ghrout ghutils giface \ @@\


Index: geant321-806-bump-mathlib-and-dependents-sonames.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/geant321-806-bump-mathlib-and-dependents-sonames.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-806-bump-mathlib-and-dependents-sonames.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ geant321-806-bump-mathlib-and-dependents-sonames.dpatch	27 Feb 2008 01:04:28 -0000	1.2
@@ -17,4 +17,4 @@
 +
  AllTarget(geant321)
  
- /* Fluka removed from Debian source package for copyright reasons. */
+ /* FLUKA removed from Debian source package for copyright reasons. */


Index: geant321-807-static-link-some-tests-on-64-bit.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/geant321-807-static-link-some-tests-on-64-bit.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geant321-807-static-link-some-tests-on-64-bit.dpatch	9 Jan 2008 23:55:25 -0000	1.1
+++ geant321-807-static-link-some-tests-on-64-bit.dpatch	27 Feb 2008 01:04:28 -0000	1.2
@@ -3,7 +3,7 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Statically link certain test programs against CERN libraries on
-## DP: 64-bit systems, since Cernlib's memory management is hopelessly
+## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
 ## DP: broken there.
 
 @DPATCH@


Index: mclibs-806-bump-mathlib-and-dependents-sonames.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/mclibs-806-bump-mathlib-and-dependents-sonames.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mclibs-806-bump-mathlib-and-dependents-sonames.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ mclibs-806-bump-mathlib-and-dependents-sonames.dpatch	27 Feb 2008 01:04:28 -0000	1.2
@@ -37,7 +37,7 @@
  #define IHaveSubdirs
  #define PassCDebugFlags
  
-+export LIB_SONAME := 2
++export LIB_SONAME := 3
 +
  LIBDIRS= code isadata isasusy isarun isatape
  


Index: mclibs-807-static-link-some-tests-on-64-bit.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/mclibs-807-static-link-some-tests-on-64-bit.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mclibs-807-static-link-some-tests-on-64-bit.dpatch	9 Jan 2008 23:55:25 -0000	1.1
+++ mclibs-807-static-link-some-tests-on-64-bit.dpatch	27 Feb 2008 01:04:28 -0000	1.2
@@ -3,7 +3,7 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Statically link certain test programs against CERN libraries on
-## DP: 64-bit systems, since Cernlib's memory management is hopelessly
+## DP: 64-bit systems, since CERNLIB's memory management is hopelessly
 ## DP: broken there.
 
 @DPATCH@


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	25 Feb 2008 00:56:31 -0000	1.11
+++ sources	27 Feb 2008 01:04:28 -0000	1.12
@@ -1,6 +1,6 @@
 fe71a3f6b95ff2151c5a4690116a0358  2006_src-free.tar.gz
 b1f550eedc545a02f0ab58eb7d550480  patchy.tar.gz
-43e1ec7ab19b55d9de065c01ca4c3182  geant321_3.21.14.dfsg-6.diff.gz
-0e109009d1bdbd056ac30401957f8487  mclibs_2006.dfsg.2-3.diff.gz
+9a19d3bd4bd63c0ee2431c8d28f308b9  geant321_3.21.14.dfsg-7.diff.gz
+c65e057e938076f73645a193d497aaf4  mclibs_2006.dfsg.2-5.diff.gz
 5e99d1d8d0e632475879e12afe6ad748  paw_2.14.04.dfsg.2-2.diff.gz
 f8628a35f2a422dfaf09edc526d448e9  cernlib_2006.dfsg.2-11.diff.gz


