rpms/cernlib/devel cernlib.spec, 1.25, 1.26 patchy-case.patch, 1.1, 1.2

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	cernlib.spec patchy-case.patch 
Log Message:
use uninstalled fcasplit for npatchy build


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cernlib.spec	13 Apr 2006 07:56:50 -0000	1.25
+++ cernlib.spec	13 Apr 2006 12:42:53 -0000	1.26
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       16%{?dist}.1
+Release:       16%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -62,7 +62,7 @@
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
 # The patchy version 4 sources
-Source300: patchy.tar.gz
+Source17: patchy.tar.gz
 # this is modified with regard with what Mattias gave me. Indeed the file
 # containing some other files (p4inceta) was in fortran unformatted format, 
 # I believe it is what caused a segfault of rceta on the ppc platform.
@@ -70,8 +70,6 @@
 # sh patchy-unpack-rceta
 Source203: patchy-unpack-rceta 
 
-Source17: patchy.tar.gz
-
 # Shell scripts that go in /etc/profile.d
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
@@ -218,6 +216,7 @@
 # not applied as it has allready been done by the sed one-liner in 
 # patchy-unpack-rceta
 Patch1500: patchy-rceta.patch
+
 Patch1501: patchy-insecure_tmp_use.diff
 Patch1502: patchy-fcasplit.patch
 Patch1503: patchy-p4comp.patch
@@ -830,7 +829,7 @@
 
 
 %changelog
-* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.1
+* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.2
 - unpack patchy offline because the files are within an unformatted
   fortran file which won't be right on all the arches.
 

patchy-case.patch:

Index: patchy-case.patch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/patchy-case.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- patchy-case.patch	11 Apr 2006 22:45:34 -0000	1.1
+++ patchy-case.patch	13 Apr 2006 12:42:53 -0000	1.2
@@ -1,6 +1,14 @@
-diff -ur 2004.orig/src/patchy/Imakefile 2004/src/patchy/Imakefile
---- 2004.orig/src/patchy/Imakefile	1997-01-21 18:29:14.000000000 +0100
-+++ 2004/src/patchy/Imakefile	2005-05-28 02:23:04.000000000 +0200
+--- 2004.orig/src/patchy/Imakefile	2006-04-13 11:15:58.000000000 +0200
++++ 2004/src/patchy/Imakefile	2006-04-13 11:27:07.000000000 +0200
+@@ -54,7 +54,7 @@
+ 
+ $(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile
+ 	ypatchy - p5lib p5lib TTY .go
+-	fcasplit p5lib.f
++	./fcasplit p5lib.f
+ 	RemoveFile(p5lib.f)
+ 	cat p5lib.libmake >> p5lib.mkfca
+ 	$(MAKE) -f p5lib.mkfca $@
 @@ -79,8 +79,8 @@
  	@ ln -s $< $@
  
@@ -12,3 +20,15 @@
  .f.o:
  	$(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $<
  
+@@ -92,9 +92,9 @@
+ YMODULES=ycompar yedit yfrceta yindex yindexb ylist ypatchy \
+ 	 ysearch yshift ytobcd ytobin ytoceta
+ 
+-P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp))
++P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp))
+ 
+-$(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)):
++$(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)):
+ 	cd $(dir $@);	\ @@\
+ 	if [ -f ../../patchy/4.15/bin/$(notdir $@) ] ; then \ @@\
+ 		ln -s ../../patchy/4.15/bin/$(notdir $@) $(notdir $@); \ @@\