rpms/cernlib/FC-4 cernlib-config_pmac.diff, NONE, 1.1 cernlib.spec, 1.8, 1.9 cernlib-config_pmac_comment_shift.diff, 1.1, NONE

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	cernlib.spec 
Added Files:
	cernlib-config_pmac.diff 
Removed Files:
	cernlib-config_pmac_comment_shift.diff 
Log Message:
remove cernlib-config_pmac_comment_shift.diff and replace by
cernlib-config_pmac.diff that also allows to use motif


cernlib-config_pmac.diff:

--- NEW FILE cernlib-config_pmac.diff ---
--- src/config/linux-pmac.cf-orig	2005-11-22 00:09:44.000000000 +0100
+++ src/config/linux-pmac.cf	2005-11-22 00:06:28.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
@@ -124,10 +124,16 @@
 /*
  *  Create a Make Variable to allow building with/out Motif
  */
+
+/*
+ * comment out such that it is always defined
 #undef MotifDependantMakeVar
 #define MotifDependantMakeVar(variable,value)                           @@\
 ifneq ($(strip $(HAVE_MOTIF)),)                                         @@\
     variable=value                                                      @@\
 endif                                                                   @@\
+
+*/
+
 /* End  CERNLIB changes */
 


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cernlib.spec	21 Nov 2005 14:20:54 -0000	1.8
+++ cernlib.spec	21 Nov 2005 23:14:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       4%{?dist}.6
+Release:       4%{?dist}.7
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -115,7 +115,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
+Patch46: cernlib-config_pmac.diff
 Patch47: 032-use-regcomp-not-re_comp
 # modified version of 013-fix-paw-imakefile-special-rules that doesn't
 # requires the debian imake rules
@@ -443,10 +443,11 @@
 %doc debian/zftp.README.debian
 
 %changelog
-* Mon Nov 21 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.6
+* 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
 - add a patch that comment out the CERNLIB_SHIFT define for ppc
+  and allows to use motif
 - exclude x86_64 as f771 segfaults on that target
 - modify or remove debian patchs that requires the new imake rules 
 


--- cernlib-config_pmac_comment_shift.diff DELETED ---