rpms/cernlib/FC-4 cernlib-config_pmac_comment_shift.diff, NONE, 1.1 cernlib.spec, 1.4, 1.5

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	cernlib.spec 
Added Files:
	cernlib-config_pmac_comment_shift.diff 
Log Message:
add a patch that comment out the CERNLIB_SHIFT define


cernlib-config_pmac_comment_shift.diff:

--- NEW FILE cernlib-config_pmac_comment_shift.diff ---
--- src/config/linux-pmac.cf.old	2005-11-18 17:18:26.000000000 +0100
+++ src/config/linux-pmac.cf	2005-11-18 17:18:57.000000000 +0100
@@ -112,7 +112,7 @@
 #define CernlibSystem           -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX \
 				-DCERNLIB_PPC -DCERNLIB_QMGLIBC
 
-#define CERNLIB_SHIFT NO
+/* #define CERNLIB_SHIFT YES */
 #define CERNLIB_LINUX
 #define CERNLIB_UNIX
 #define CERNLIB_LNX


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cernlib.spec	18 Nov 2005 15:33:16 -0000	1.4
+++ cernlib.spec	18 Nov 2005 16:45:31 -0000	1.5
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       4%{?dist}.2
+Release:       4%{?dist}.3
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -111,6 +111,7 @@
 Patch43: cernlib-v107z0_X_before_string.diff
 Patch44: cernlib-bimsel-nodouble-save.diff
 Patch45: 029-fixes-for-MacOSX
+Patch46: cernlib-config_pmac_comment_shift.diff
 
 
 %description
@@ -259,7 +260,9 @@
 %patch -P 42
 %patch -P 43
 %patch -P 44
+# try to build on ppc
 %patch -P 45
+%patch -P 46
 
 
 %build
@@ -332,7 +335,8 @@
 
 # Build paw
 cd $CERN_ROOT/build/pawlib
-make %{?_smp_mflags} install.bin
+#  %{?_smp_mflags} may break the build
+make install.bin
 
 # Build packlib
 cd $CERN_ROOT/build/packlib
@@ -431,8 +435,9 @@
 %doc debian/zftp.README.debian
 
 %changelog
-* Fri Nov 18 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.2
-- add debian patch for MacOSX that should fix the PPC build
+* Fri Nov 18 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.3
+- add debian patch for MacOSX that could have fixed the PPC build
+- add a patch that comment out the CERNLIB_SHIFT define
 
 * Tue Nov 15 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.1
 - add a .csh file