rpms/cernlib/devel .cvsignore, 1.12, 1.13 cernlib-304-update-Imake-config-files.dpatch, 1.5, 1.6 cernlib.spec, 1.72, 1.73 sources, 1.13, 1.14

Fri Apr 4 22:22:13 UTC 2008

Author: pertusus

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

Modified Files:
	.cvsignore cernlib-304-update-Imake-config-files.dpatch 
	cernlib.spec sources 
Log Message:
* Sat Apr  5 2008 Patrice Dumas <pertusus at free.fr> 2006-29
- debian cernlib 2006.dfsg.2-13 patchset



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13

--- .cvsignore	24 Mar 2008 23:48:46 -0000	1.12
+++ .cvsignore	4 Apr 2008 22:21:28 -0000	1.13
@@ -1,4 +1,4 @@
-cernlib_2006.dfsg.2-12.diff.gz
+cernlib_2006.dfsg.2-13.diff.gz
 2006_src-free.tar.gz
 patchy.tar.gz
 paw_2.14.04.dfsg.2-3.diff.gz


Index: cernlib-304-update-Imake-config-files.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-304-update-Imake-config-files.dpatch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cernlib-304-update-Imake-config-files.dpatch	24 Mar 2008 23:48:46 -0000	1.5
+++ cernlib-304-update-Imake-config-files.dpatch	4 Apr 2008 22:21:28 -0000	1.6
@@ -9,15 +9,14 @@
 @DPATCH@
 diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.cf cernlib-2006.dfsg.2/src/config/Imake.cf
 --- cernlib-2006.dfsg.2~/src/config/Imake.cf	2006-09-15 02:34:47.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/config/Imake.cf	2008-03-12 09:57:41.000000000 -0700
++++ cernlib-2006.dfsg.2/src/config/Imake.cf	2008-03-14 10:03:13.000000000 -0700
 @@ -1,27 +1,5 @@
 -/* $Id$
 - *
 - * $Log$
-- * Revision 1.5  2008/03/24 23:48:46  pertusus
-- * * Tue Mar 25 2008 Patrice Dumas <pertusus at free.fr> 2006-28
-- * - new cernlib, paw and geant321 debian patchesets
-- * - use regular p5boot and patchy build
+- * Revision 1.6  2008/04/04 22:21:28  pertusus
+- * * Sat Apr  5 2008 Patrice Dumas <pertusus at free.fr> 2006-29
+- * - debian cernlib 2006.dfsg.2-13 patchset
 - *
 - * Revision 1.6  2006/09/15 09:34:47  mclareni
 - * Submitted mods for gcc4/gfortran and MacOSX, corrected to work also on slc4 with gcc3.4 and 4.1
@@ -1465,7 +1464,7 @@
  XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
 diff -urNad cernlib-2006.dfsg.2~/src/config/linux-lp64.cf cernlib-2006.dfsg.2/src/config/linux-lp64.cf
 --- cernlib-2006.dfsg.2~/src/config/linux-lp64.cf	2006-12-20 06:21:03.000000000 -0800
-+++ cernlib-2006.dfsg.2/src/config/linux-lp64.cf	2008-03-12 09:57:41.000000000 -0700
++++ cernlib-2006.dfsg.2/src/config/linux-lp64.cf	2008-03-14 10:03:13.000000000 -0700
 @@ -153,7 +153,7 @@
  # define XargsCmd               xargs
  # define FortranSaveFlags       -fno-automatic
@@ -1477,7 +1476,7 @@
  
 diff -urNad cernlib-2006.dfsg.2~/src/config/linux.cf cernlib-2006.dfsg.2/src/config/linux.cf
 --- cernlib-2006.dfsg.2~/src/config/linux.cf	2006-09-15 02:34:48.000000000 -0700
-+++ cernlib-2006.dfsg.2/src/config/linux.cf	2008-03-12 09:58:59.000000000 -0700
++++ cernlib-2006.dfsg.2/src/config/linux.cf	2008-03-14 10:08:50.000000000 -0700
 @@ -68,20 +68,20 @@
  #define OSVendor		/**/
  #define OSMajorVersion		2
@@ -1503,7 +1502,7 @@
  #endif
  #define HasPutenv		YES
  #define HasShm			YES
-@@ -97,38 +97,307 @@
+@@ -97,38 +97,308 @@
  #define NeedVarargsPrototypes	YES
  #define NeedWidePrototypes	NO
  
@@ -1651,7 +1650,8 @@
 +# define LinuxMachineDefines    -D__arm__ -D__arm32__ -U__arm -Uarm
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
-+# ifdef __ARMEB__ /* test for big-endianness */
++# if defined(__ARMEB__) || defined(Arm32ebArchitecture)
++  /* test for big-endianness */
 +#  define CernlibMachineDefines	-DCERNLIB_PPC
 +#  define CERNLIB_PPC
 +# endif
@@ -1737,7 +1737,7 @@
 +
 +#ifdef MipsArchitecture
 +# ifndef OptimizationLevel
-+#  define OptimizationLevel	-O1
++#  define OptimizationLevel	-O0 /* Needed for http://gcc.gnu.org/PR35662 */
 +# endif
 +# ifndef OptimizedCDebugFlags
 +#  define OptimizedCDebugFlags  OptimizationLevel
@@ -1745,7 +1745,7 @@
 +# define LinuxMachineDefines    -D__mips__
 +# define ServerOSDefines        XFree86ServerOSDefines -DDDXTIME -DPART_NET
 +# define ServerExtraDefines     -DGCCUSESGAS XFree86ServerDefines
-+# ifdef __MIPSEB__
++# if !defined(MipselArchitecture) /* then big-endian, i.e. mips */
 +#  define CernlibMachineDefines	-DCERNLIB_PPC
 +#  define CERNLIB_PPC
 +# endif
@@ -1825,7 +1825,7 @@
  /* Some of these man page defaults are overriden in the above OS sections */
  #ifndef ManSuffix
  # define ManSuffix	1x
-@@ -163,7 +432,7 @@
+@@ -163,7 +433,7 @@
  #define FortranSaveFlags	/* */ /* Everything static !? */
  #define OptimisedFortranFlags   -g -pc 64 -tp p6
  #define DefaultFCOptions        -Msave -fpic -Kieee
@@ -1834,7 +1834,7 @@
  
  #else
  
-@@ -174,19 +443,18 @@
+@@ -174,19 +444,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1866,7 +1866,7 @@
   
  #else
  
-@@ -197,19 +465,18 @@
+@@ -197,19 +466,18 @@
  #  undef StandardDefines
  #  undef NeedFunctionPrototypes
  #  undef NeedWidePrototypes
@@ -1898,7 +1898,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */
-@@ -222,25 +489,30 @@
+@@ -222,25 +490,30 @@
  #else
  
  # ifdef Hasgfortran
@@ -1939,7 +1939,7 @@
  
  #define CERNLIB_GFORTRAN
   
-@@ -249,17 +521,32 @@
+@@ -249,17 +522,32 @@
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
  
@@ -1975,7 +1975,7 @@
  
  # endif
  # endif
-@@ -280,7 +567,7 @@
+@@ -280,7 +568,7 @@
  /*
   *  Create a Make Variable to allow building with/out Motif
   */


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- cernlib.spec	24 Mar 2008 23:48:46 -0000	1.72
+++ cernlib.spec	4 Apr 2008 22:21:28 -0000	1.73
@@ -55,7 +55,7 @@
 
 Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       28%{?dist}
+Release:       29%{?dist}
 Summary:       General purpose CERN library
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -138,7 +138,7 @@
 Source204: cernlib-debian-copyright.in
 
 # debian patchsets
-Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-12.diff.gz
+Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-13.diff.gz
 Patch100002: http://ftp.de.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-3.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-8.diff.gz
@@ -1440,6 +1440,9 @@
 %endif
 
 %changelog
+* Sat Apr  5 2008 Patrice Dumas <pertusus at free.fr> 2006-29
+- debian cernlib 2006.dfsg.2-13 patchset
+
 * Tue Mar 25 2008 Patrice Dumas <pertusus at free.fr> 2006-28
 - new cernlib, paw and geant321 debian patchesets
 - use regular p5boot and patchy build 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	24 Mar 2008 23:48:46 -0000	1.13
+++ sources	4 Apr 2008 22:21:28 -0000	1.14
@@ -1,4 +1,4 @@
-51fbf1feea2e9040464a3e7af19e7097  cernlib_2006.dfsg.2-12.diff.gz
+afc3aa5c80b4f876f48bc888a570d511  cernlib_2006.dfsg.2-13.diff.gz
 fe71a3f6b95ff2151c5a4690116a0358  2006_src-free.tar.gz
 b1f550eedc545a02f0ab58eb7d550480  patchy.tar.gz
 d8e01253d4cd737d63962003b612326c  paw_2.14.04.dfsg.2-3.diff.gz


