rpms/cernlib/FC-3 315-fixes-for-MacOSX.dpatch, 1.1, 1.2 cernlib.spec, 1.9, 1.10

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	315-fixes-for-MacOSX.dpatch cernlib.spec 
Log Message:
Modify patch 315 that conflicted with 211



Index: 315-fixes-for-MacOSX.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/315-fixes-for-MacOSX.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 315-fixes-for-MacOSX.dpatch	9 Dec 2005 15:57:06 -0000	1.1
+++ 315-fixes-for-MacOSX.dpatch	9 Dec 2005 17:31:10 -0000	1.2
@@ -679,10 +679,10 @@
 diff -urNad cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F
 --- cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	1996-02-26 12:16:25.000000000 -0500
 +++ /tmp/dpep.kYNoLQ/cernlib-2005.05.09/src/pawlib/comis/code/csaddr.F	2005-06-09 15:52:06.487068895 -0400
-@@ -26,7 +26,12 @@
-       I=CSLTGP(IPVS)
-       IF(I.GT.0)THEN
-         IF(IFCS.EQ.0)THEN
+@@ -38,7 +38,12 @@
+             IFCS=-2
+             CALL CSRTGPL(I)
+ #else
 +c     thanks to Keisuke Fujii for this patch for OS X
 +#if defined(CERNLIB_MACOSX)
 +          IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
@@ -692,10 +692,10 @@
            IF(IADGP.NE.0)THEN
              IFCS=-2
              CALL CSRTGP(I)
-@@ -35,7 +40,11 @@
-           ENDIF
+@@ -58,7 +63,11 @@
+           I=CSITGPL(IPVS)
          ENDIF
-       ELSE
+ #else
 +#if defined(CERNLIB_MACOSX)
 +        IADGP=CS_GET_FUNC('_'//NAME(1:NC)//'_')
 +#else


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-3/cernlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cernlib.spec	9 Dec 2005 16:17:31 -0000	1.9
+++ cernlib.spec	9 Dec 2005 17:31:10 -0000	1.10
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       8%{?dist}.2
+Release:       8%{?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.
@@ -692,7 +692,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Fri Dec  9 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-8.2
+* Fri Dec  9 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-8.3
 - update with newer debian patchset for cernlib, fix licence issues
 - enable 64 bit fixes patch
 - remove the BSD in the licence because there is no library nor binary