Sun May 13 23:31:05 UTC 2007

Author: pertusus

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

Modified Files:
	.cvsignore cernlib-321-support-gfortran.dpatch 
	cernlib-800-implement-shared-library-rules-in-Imake.dpatch 
	cernlib-fedora_desktop.patch cernlib.spec 
	paw-806-bump-mathlib-and-dependents-sonames.dpatch sources 
Added Files:
	cernlib-122-fix-cdf-file-syntax-errors.dpatch 
	cernlib-123-extern-memmove-only-if-not-macro.dpatch 
Removed Files:
	cernlib-fedora_script.patch cernlib-fortify.patch 
	cernlib-soname.patch 
Log Message:
* Sun May 13 2007 Patrice Dumas <pertusus at free.fr> 2006-9
- add a compat prefix when built with g77
- new debian patcheset

--- NEW FILE cernlib-122-fix-cdf-file-syntax-errors.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 122-fix-cdf-file-syntax-errors.dpatch by  <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix some lines in CDF file descriptions that were accidentally
## DP: commented out by virtue of beginning with a '*' character.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/cspack/programs/zftp/zftpcdf.cdf cernlib-2006.dfsg.2/src/packlib/cspack/programs/zftp/zftpcdf.cdf
--- cernlib-2006.dfsg.2~/src/packlib/cspack/programs/zftp/zftpcdf.cdf	1996-03-08 10:44:20.000000000 -0500
+++ cernlib-2006.dfsg.2/src/packlib/cspack/programs/zftp/zftpcdf.cdf	2007-04-21 18:56:29.000000000 -0400
@@ -388,8 +388,8 @@
 CHOPT 'CHOPT' C D=' '
 >Guidance
 Transfer all files matching the specified remote file name
-to the local system. The file name given may contain
-*, to match one or more characters, or %, to match a single
+to the local system. The file name given may contain *,
+to match one or more characters, or %, to match a single
 character.
 .
 By default the transfer is performed
@@ -397,9 +397,9 @@
 .
 e.g.
 .
-*.PAM         --> GETP
-*.CETA, *.CET --> GETB, LRECL=3600
-*.CMZ,  *.RZ  --> GETRZ
+ *.PAM         --> GETP
+ *.CETA, *.CET --> GETB, LRECL=3600
+ *.CMZ,  *.RZ  --> GETRZ
 .
 Options are passed to the appropriate transfer routine.
 >Action MGET
@@ -413,17 +413,18 @@
 CHOPT 'CHOPT' C D=' '
 >Guidance
 Transfer all files matching the specified local file name
-to the remote system. The file name given may contain
-*, to match one or more characters, or %, to match a single
+to the remote system. The file name given may contain *,
+to match one or more characters, or %, to match a single
 character.
+.
 By default the transfer is performed
 using PUTA, unless the file name has a known extension.
 .
 e.g.
 .
-*.PAM         --> GETP
-*.CETA, *.CET --> GETB, LRECL=3600
-*.CMZ,  *.RZ  --> GETRZ
+ *.PAM         --> GETP
+ *.CETA, *.CET --> GETB, LRECL=3600
+ *.CMZ,  *.RZ  --> GETRZ
 .
 e.g.
 .
diff -urNad cernlib-2006.dfsg.2~/src/packlib/fatmen/programs/fmkuip/fmcdf.cdf cernlib-2006.dfsg.2/src/packlib/fatmen/programs/fmkuip/fmcdf.cdf
--- cernlib-2006.dfsg.2~/src/packlib/fatmen/programs/fmkuip/fmcdf.cdf	1997-01-07 06:20:31.000000000 -0500
+++ cernlib-2006.dfsg.2/src/packlib/fatmen/programs/fmkuip/fmcdf.cdf	2007-04-21 18:58:52.000000000 -0400
@@ -324,8 +324,8 @@
 >Command SEARCH
 >Guidance
 Use the SEARCH command to print the generic names of files which
-match the specified criteria. Character fields may include the
-* or % wild cards.
+match the specified criteria. Character fields may include the *
+or % wild cards.
 .
 e.g. SEARCH * VID=I* # search current working directory for entries
 # with VID's beginning with I.
@@ -432,7 +432,7 @@
 If no wild-cards are present in the pathname, the characters /*
 are automatically appended. To zoom down a tree starting with
 .
-*ALLD, use ZOOM *ALLD/*
+ *ALLD, use ZOOM *ALLD/*
 .
 >MENU \FMDATA
 >Guidance


--- NEW FILE cernlib-123-extern-memmove-only-if-not-macro.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 123-extern-memmove-only-if-not-macro.dpatch by  <pertusus at free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Declare memmove() only if it is not already defined as a macro.

@DPATCH@
diff -urNad cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kstring.h cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kstring.h
--- cernlib-2006.dfsg.2~/src/packlib/kuip/kuip/kstring.h	2007-04-21 19:21:26.000000000 -0400
+++ cernlib-2006.dfsg.2/src/packlib/kuip/kuip/kstring.h	2007-04-21 19:22:20.000000000 -0400
@@ -21,8 +21,10 @@
  */
 
 #ifndef WIN32
+#ifndef memmove
 extern void* memmove( void* dst, const void* src, size_t n );
 #endif
+#endif
 
 /* GF. make conform to kkern.c#if !defined(__convexc__)*/
 #ifndef HAVE_STRCASECMP


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Apr 2007 14:35:24 -0000	1.5
+++ .cvsignore	13 May 2007 23:30:30 -0000	1.6
@@ -1,6 +1,6 @@
-paw_2.14.04.dfsg-1.diff.gz
-mclibs_2006.dfsg-1.diff.gz
-cernlib_2006.dfsg-1.diff.gz
-geant321_3.21.14.dfsg-4.diff.gz
 2006_src-free.tar.gz
 patchy.tar.gz
+cernlib_2006.dfsg.2-1.diff.gz
+geant321_3.21.14.dfsg-5.diff.gz
+mclibs_2006.dfsg.2-1.diff.gz
+paw_2.14.04.dfsg.2-1.diff.gz


Index: cernlib-321-support-gfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-321-support-gfortran.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib-321-support-gfortran.dpatch	21 Apr 2007 14:35:24 -0000	1.2
+++ cernlib-321-support-gfortran.dpatch	13 May 2007 23:30:30 -0000	1.3
@@ -5,9 +5,9 @@
 ## DP: Support compilation with gfortran.  Patch thanks to Harald Vogt
 
 @DPATCH@
-diff -urNad cernlib-2005.dfsg~/src/mathlib/gen/c/rteq464.F cernlib-2005.dfsg/src/mathlib/gen/c/rteq464.F
---- cernlib-2005.dfsg~/src/mathlib/gen/c/rteq464.F	1996-04-01 10:01:53.000000000 -0500
-+++ cernlib-2005.dfsg/src/mathlib/gen/c/rteq464.F	2006-09-07 15:06:08.249547206 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/c/rteq464.F	1996-04-01 10:01:53.000000000 -0500
++++ cernlib-2006.dfsg.2/src/mathlib/gen/c/rteq464.F	2007-04-21 19:45:12.000000000 -0400
 @@ -45,7 +45,16 @@
           MT=3
           Z(1)=SQRT(SQRT(-D))
@@ -47,9 +47,9 @@
        ENDIF
        W3=0
        IF(W1*W2 .NE. 0) W3=-Q/(8*W1*W2)
-diff -urNad cernlib-2005.dfsg~/src/mathlib/gen/v/nranf.F cernlib-2005.dfsg/src/mathlib/gen/v/nranf.F
---- cernlib-2005.dfsg~/src/mathlib/gen/v/nranf.F	1996-04-01 10:02:54.000000000 -0500
-+++ cernlib-2005.dfsg/src/mathlib/gen/v/nranf.F	2006-09-07 15:06:08.250546993 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F
+--- cernlib-2006.dfsg.2~/src/mathlib/gen/v/nranf.F	1996-04-01 10:02:54.000000000 -0500
++++ cernlib-2006.dfsg.2/src/mathlib/gen/v/nranf.F	2007-04-21 19:45:12.000000000 -0400
 @@ -14,10 +14,12 @@
        VECTOR(I) = RNDM(I)
    100 CONTINUE
@@ -65,9 +65,9 @@
        CALL RDMOUT(V)
        RETURN
        END
-diff -urNad cernlib-2005.dfsg~/src/packlib/hbook/chbook/Imakefile cernlib-2005.dfsg/src/packlib/hbook/chbook/Imakefile
---- cernlib-2005.dfsg~/src/packlib/hbook/chbook/Imakefile	1999-11-15 08:25:58.000000000 -0500
-+++ cernlib-2005.dfsg/src/packlib/hbook/chbook/Imakefile	2006-09-07 15:06:08.250546993 -0400
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/hbook/chbook/Imakefile	1999-11-15 08:25:58.000000000 -0500
++++ cernlib-2006.dfsg.2/src/packlib/hbook/chbook/Imakefile	2007-04-21 19:45:12.000000000 -0400
 @@ -13,7 +13,19 @@
  #endif
  
@@ -88,3 +88,38 @@
 +#endif
  
  SubdirLibraryTarget(NullParameter,NullParameter)
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2006-09-04 08:32:59.000000000 -0400
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/Imakefile	2007-04-21 19:45:41.000000000 -0400
+@@ -1,6 +1,6 @@
+ 
+-SRCS_F= irndm.F qnext.F rdmin.F
++SRCS_F= irndm.F qnext.F rdmin.F getarg.F
+ 
+-SRCS_C= lshift.c ishftr.c getarg.c
++SRCS_C= lshift.c ishftr.c /* getarg.c */
+ 
+ SubdirLibraryTarget(NullParameter,NullParameter)
+diff -urNad cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F
+--- cernlib-2006.dfsg.2~/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F	1969-12-31 19:00:00.000000000 -0500
++++ cernlib-2006.dfsg.2/src/packlib/kernlib/kerngen/unix/gfortgs/getarg.F	2007-04-21 19:48:39.000000000 -0400
+@@ -0,0 +1,19 @@
++*     Wrapper GETARG routine for gfortran,
++*     originally written by Harald Vogt <hvogt at ifh.de>
++*
++      SUBROUTINE GETARG (JARG, CHARG)
++*     The following stuff is required to use gfortrans inline routine GETARG
++*     It is required to avoid the calling GETARG here which conflicts
++*     to the Fortran rules
++      CHARACTER    CHARG*(*)
++      CALL MYGETARG (JARG, CHARG)
++      END
++
++      SUBROUTINE MYGETARG (JARG, CHARG)
++      CHARACTER    CHARG*(*)
++*     gfortran translates the following line to a call
++*     to its library routine _gfortran_getarg_i4
++*     therefore it will not clash in the linking step
++      CALL GETARG (JARG, CHARG)
++      END
++ 


Index: cernlib-800-implement-shared-library-rules-in-Imake.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-800-implement-shared-library-rules-in-Imake.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-800-implement-shared-library-rules-in-Imake.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ cernlib-800-implement-shared-library-rules-in-Imake.dpatch	13 May 2007 23:30:30 -0000	1.2
@@ -5,9 +5,9 @@
 ## DP: Implement macros for shared libraries on Linux in the Imake cfg files.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
---- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2006-01-02 10:42:00.576902424 -0500
-+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2006-01-02 10:42:08.484202137 -0500
+diff -urNad cernlib-2006.dfsg.2~/src/config/Imake.rules cernlib-2006.dfsg.2/src/config/Imake.rules
+--- cernlib-2006.dfsg.2~/src/config/Imake.rules	2007-04-25 23:32:50.000000000 -0400
++++ cernlib-2006.dfsg.2/src/config/Imake.rules	2007-04-25 23:32:52.000000000 -0400
 @@ -904,6 +904,8 @@
   * InstallSharedLibrary - generate rules to install the indicated sharable 
   * Library
@@ -56,9 +56,9 @@
  ifneq (locallib,)							@@\
  override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB)	@@\
  									@@\
-diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules
---- cernlib-2005.05.09.dfsg~/src/config/biglib.rules	2000-04-19 06:51:01.000000000 -0400
-+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules	2006-01-02 10:42:08.485201922 -0500
+diff -urNad cernlib-2006.dfsg.2~/src/config/biglib.rules cernlib-2006.dfsg.2/src/config/biglib.rules
+--- cernlib-2006.dfsg.2~/src/config/biglib.rules	2000-04-19 06:51:01.000000000 -0400
++++ cernlib-2006.dfsg.2/src/config/biglib.rules	2007-04-25 23:33:16.000000000 -0400
 @@ -227,7 +227,7 @@
  	RanLibrary($@)
  #endif
@@ -77,7 +77,7 @@
  
  #ifndef SharedLibraryTargetName
  #define SharedLibraryTargetName(name)Concat(lib,name.so)
-@@ -281,6 +281,41 @@
+@@ -281,6 +281,45 @@
  	@date
  #endif
  
@@ -87,13 +87,17 @@
 +#define SharedLibraryTargetName(name)Concat(lib,name.so.$(LIB_SONAME).$(CERN_LEVEL))
 +#endif
 +
++#ifndef SharedLibrarySonameName
++#define SharedLibrarySonameName(name)Concat(lib,name.so.$(LIB_SONAME)$(TOOL_SONAME))
++#endif
++
 +#ifndef SharedLibraryBuild
 +#define SharedLibraryBuild(libname,version)				@@\
 +SharedLibraryTargetName(libname): version/objects.list			@@\
 +	@echo rebuild version library $@ in $(CURRENT_DIR)		@@\
 +	@$(RM) $@							@@\
 +	@date								@@\
-+	@$(FCLINK) -shared -Wl,-soname=Concat(lib,libname.so.$(LIB_SONAME))\ @@\
++	@$(FCLINK) -shared -Wl,-soname=SharedLibrarySonameName(libname)\ @@\
 +		-o $@ `cat version/objects.list` `cernlib -v "" -dy libname\ @@\
 +		| sed s/Concat(-l,libname)//g`				@@\
 +	@date
@@ -119,9 +123,9 @@
  #elif 1 
  #ifndef SharedLibraryBuild
  #define SharedLibraryBuild(libname,version)				@@\
-diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules
---- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules	1995-12-20 10:26:45.000000000 -0500
-+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules	2006-01-02 10:42:08.485201922 -0500
+diff -urNad cernlib-2006.dfsg.2~/src/config/lnxLib.rules cernlib-2006.dfsg.2/src/config/lnxLib.rules
+--- cernlib-2006.dfsg.2~/src/config/lnxLib.rules	1995-12-20 10:26:45.000000000 -0500
++++ cernlib-2006.dfsg.2/src/config/lnxLib.rules	2007-04-25 23:33:16.000000000 -0400
 @@ -43,6 +43,9 @@
  #ifndef PositionIndependentCplusplusFlags
  #define PositionIndependentCplusplusFlags -fPIC
@@ -145,12 +149,14 @@
 +$(DESTDIR)dest/SharedLibraryTargetName(libname): SharedLibraryTargetName(libname) @@\
  	MakeDir($(DESTDIR)dest)						@@\
 -	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
-+	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
- 	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
- 		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
+-	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
+-		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
++	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) SharedLibraryTargetName(libname) $(DESTDIR)dest @@\
++	$(RM) SharedLibrarySonameName(libname) \
++		&& $(LN) SharedLibraryTargetName(libname) $(DESTDIR)dest/SharedLibrarySonameName(libname)	@@\
  	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
 -	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
-+	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so) @@\
++	$(LN) SharedLibraryTargetName(libname) Concat($(DESTDIR)dest/lib,libname.so) @@\
 +	$(RM) $<                                                        @@\
 +	$(LN) $@ $<
  #endif /* InstallSharedLibrary */

cernlib-fedora_desktop.patch:

Index: cernlib-fedora_desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-fedora_desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-fedora_desktop.patch	21 Apr 2007 14:35:24 -0000	1.1
+++ cernlib-fedora_desktop.patch	13 May 2007 23:30:30 -0000	1.2
@@ -1,5 +1,5 @@
---- cernlib-2006/paw-2.14.04.dfsg/debian/add-ons/misc/paw++.desktop.fedora_desktop	2007-04-14 23:41:45.000000000 +0200
-+++ cernlib-2006/paw-2.14.04.dfsg/debian/add-ons/misc/paw++.desktop	2007-04-14 23:44:39.000000000 +0200
+--- cernlib-2006/paw-2.14.04.dfsg.2/debian/add-ons/misc/paw++.desktop.fedora_desktop	2007-04-14 23:41:45.000000000 +0200
++++ cernlib-2006/paw-2.14.04.dfsg.2/debian/add-ons/misc/paw++.desktop	2007-04-14 23:44:39.000000000 +0200
 @@ -7,5 +7,5 @@
  Comment[en_GB]=Analyse and graphically present experimental data
  Type=Application


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cernlib.spec	24 Apr 2007 19:02:03 -0000	1.50
+++ cernlib.spec	13 May 2007 23:30:30 -0000	1.51
@@ -8,15 +8,16 @@
 %if %{with gfortran}
 %else
 %define compiler -g77
+%define compat compat-
 %endif
 # verdir is the directory used for libraries and replaces the version 
 # in some files and file names
 %define verdir %{version}%{?compiler}
 # data files should be the same and therefore parallel installable
 
-Name:          cernlib%{?compiler}
+Name:          %{?compat}cernlib%{?compiler}
 Version:       2006
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -101,10 +102,10 @@
 Source203: cernlib-debian-copyright.in
 
 # debian patchsets
-Patch100001: http://ftp.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg-1.diff.gz
-Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg-1.diff.gz
-Patch100003: http://ftp.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg-1.diff.gz
-Patch100004: http://ftp.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-4.diff.gz
+Patch100001: http://ftp.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-1.diff.gz
+Patch100002: http://ftp.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-1.diff.gz
+Patch100003: http://ftp.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-1.diff.gz
+Patch100004: http://ftp.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-5.diff.gz
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: geant321-001-fix-missing-fluka.dpatch
@@ -143,6 +144,8 @@
 Patch12002: paw-120-fix-mlp-cdf-file.dpatch
 Patch12101: cernlib-121-fix-mathlib-test-case-c209m.dpatch
 Patch12102: paw-121-call-gfortran-in-cscrexec.dpatch
+Patch122: cernlib-122-fix-cdf-file-syntax-errors.dpatch
+Patch123: cernlib-123-extern-memmove-only-if-not-macro.dpatch
 Patch200: paw-200-comis-allow-special-chars-in-path.dpatch
 Patch201: cernlib-201-update-kuip-helper-apps.dpatch
 Patch202: cernlib-202-fix-includes-in-minuit-example.dpatch
@@ -279,8 +282,6 @@
 # not needed in 2006
 #Patch1203: cernlib-hwuli2_use_dimag.diff 
 #Patch1204: cernlib-hwhiga_use_dimag.diff
-# don't add prototypes if allready defined as a macro
-Patch1205: cernlib-fortify.patch
 # modify the cernlib man page to fit with the distribution
 Patch1206: cernlib-man_static.patch
 # modify the debian cernlib paw desktop file icon name
@@ -289,13 +290,8 @@
 Patch1208: cernlib-test.patch
 # don't recurse in eurodec for tests because the testcase segfaults
 Patch1210: cernlib-segf_eudtest.patch
-# add a tool name in soname to distinguish g77 and gfortran builds
-Patch1209: cernlib-soname.patch
 # kernnum test error on 64 bit
 Patch1211: cernlib-64test.patch
-# debian cernlib script supposes that libs are in %%_prefix, it is 
-# not the case on fedora
-Patch1212: cernlib-fedora_script.patch
 
 # patchy 4
 # not applied as it has allready been done by the sed one-liner in 
@@ -371,22 +367,22 @@
 want to have different compile script and different environments for 
 different versions of the library you have to set them by hand.
 
-%package -n paw%{?compiler}
+%package -n %{?compat}paw%{?compiler}
 Group: Applications/Engineering
 Summary: A program for the analysis and presentation of data
 
-%description -n paw%{?compiler}
+%description -n %{?compat}paw%{?compiler}
 PAW is conceived as an instrument to assist physicists in the analysis and 
 presentation of their data. It provides interactive graphical presentation 
 and statistical or mathematical analysis, working on objects familiar to 
 physicists like histograms, event files (Ntuples), vectors, etc. PAW is 
 based on several components of the CERN Program Library.
 
-%package -n geant321%{?compiler}
+%package -n %{?compat}geant321%{?compiler}
 Summary:  Particle detector description and simulation tool
 Group:    Applications/Engineering
 Requires: cernlib-devel cernlib-utils
-%description -n geant321%{?compiler}
+%description -n %{?compat}geant321%{?compiler}
 Geant simulates the passage of subatomic particles through matter, for 
 instance, particle detectors. For maximum flexibility, Geant simulations 
 are performed by linking Fortran code supplied by the user with the Geant 
@@ -394,12 +390,12 @@
 
 This package includes gxint, the script used to perform this linking step. 
 
-%package -n kuipc%{?compiler}
+%package -n %{?compat}kuipc%{?compiler}
 Summary:  Cernlib's Kit for a User Interface Package (KUIP) compiler
 Group:    Development/Languages
 Requires: cernlib-devel
 
-%description -n kuipc%{?compiler}
+%description -n %{?compat}kuipc%{?compiler}
 KUIPC, the Kit for a User Interface Package Compiler, is a tool to simplify 
 the writing of a program's user interface code. It takes as input a Command 
 Definition File (CDF) that describes the commands to be understood by the 
@@ -418,11 +414,11 @@
 According to the responsible of the cernlib debian package, some
 of these utilities may have security flaws.
 
-%package -n patchy%{?compiler}
+%package -n %{?compat}patchy%{?compiler}
 Group: Applications/Archiving
 Summary: The patchy utilities
 
-%description -n patchy%{?compiler}
+%description -n %{?compat}patchy%{?compiler}
 Utilities for extracting sources from patchy cards and cradles.
 
 
@@ -451,9 +447,7 @@
 %patch -P 1503
 %patch -P 1507 -p1 -b .use_OPT
 
-# patches for FORTIFY_SOURCE, cernlib-static script and man page
-%patch -P 1205 -p1 -b .fortify
-%patch -P 1200 -p1 -b .script
+# patches for man page
 %patch -P 1206 -p1 -b .man_static
 
 # debian patchesets
@@ -463,9 +457,7 @@
 %patch -P 100004 -p0 
 %patch -P 1207 -p1 -b .fedora_desktop
 
-cp -p cernlib-2006.dfsg/debian/add-ons/bin/cernlib.in .
-
-%patch -P 1212 -p1 -b .fedora_script
+cp -p cernlib-2006.dfsg.2/debian/add-ons/bin/cernlib.in .
 
 cd %{version}
 %patch -P 1100 -p2
@@ -504,6 +496,8 @@
 %patch -P 12002 -p1
 %patch -P 12101 -p1
 %patch -P 12102 -p1
+%patch -P 122 -p1
+%patch -P 123 -p1
 %patch -P 200 -p1
 %patch -P 201 -p1
 %patch -P 202 -p1
@@ -670,7 +664,6 @@
 #%patch -P 1204
 %patch -P 1208 -p2 -b .test
 %patch -P 1210 -p2 -b .segf_eudtest
-%patch -P 1209 -p2 -b .soname
 
 %ifarch x86_64
 %patch -P 1211 -p2 -b .64test
@@ -938,10 +931,7 @@
 
 # install the tree.h and converter.h include files redirecting to 
 # system headers
-%{__install} -p -m644 ../../paw-2.14.04.dfsg/debian/add-ons/paw/*.h %{buildroot}%{_includedir}/cernlib/%{version}/paw
-
-# remove the patch backup files
-rm %{buildroot}%{_includedir}/cernlib/%{version}/kuip/kstring.h.*
+%{__install} -p -m644 ../../paw-2.14.04.dfsg.2/debian/add-ons/paw/*.h %{buildroot}%{_includedir}/cernlib/%{version}/paw
 
 %{__install} -d -m755 %{buildroot}/etc/ld.so.conf.d
 echo %{_libdir}/cernlib/%{verdir}/lib > %{buildroot}/etc/ld.so.conf.d/cernlib-%{verdir}-%{_arch}.conf
@@ -1014,11 +1004,11 @@
 
 %postun -p /sbin/ldconfig
 
-%post -n paw%{?compiler}
+%post -n %{?compat}paw%{?compiler}
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-%postun -n paw%{?compiler}
+%postun -n %{?compat}paw%{?compiler}
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
@@ -1026,9 +1016,9 @@
 %defattr(-,root,root,-)
 %doc cernlib.README debian-copyright
 %doc geant321-3.21.14.dfsg/debian/debhelper/geant321.README.debian 
-%doc mclibs-2006.dfsg/debian/debhelper/libpdflib804-2-dev.README.debian
-%doc mclibs-2006.dfsg/debian/debhelper/montecarlo-base.README.debian
-%doc cernlib-2006.dfsg/debian/add-ons/vim/
+%doc mclibs-2006.dfsg.2/debian/debhelper/libpdflib804-2-dev.README.debian
+%doc mclibs-2006.dfsg.2/debian/debhelper/montecarlo-base.README.debian
+%doc cernlib-2006.dfsg.2/debian/add-ons/vim/
 /etc/ld.so.conf.d/*
 %dir %{_libdir}/cernlib/
 %dir %{_libdir}/cernlib/%{verdir}
@@ -1057,7 +1047,7 @@
 %{_sysconfdir}/profile.d/cernlib-%{verdir}.csh
 %{_mandir}/man1/cernlib*.1*
 
-%files -n paw%{?compiler}
+%files -n %{?compat}paw%{?compiler}
 %defattr(-,root,root,-)
 %doc paw.README
 %{_bindir}/paw++%{?compiler}
@@ -1075,20 +1065,20 @@
 %{_datadir}/applications/*paw*.desktop
 %{_datadir}/pixmaps/paw*.xpm
 
-%files -n geant321%{?compiler}
+%files -n %{?compat}geant321%{?compiler}
 %defattr(-,root,root,-)
 %{_bindir}/gxint%{?compiler}
 %{_datadir}/X11/app-defaults/*Geant++
 %{_mandir}/man1/gxint.1*
 
-%files -n kuipc%{?compiler}
+%files -n %{?compat}kuipc%{?compiler}
 %defattr(-,root,root,-)
 %{_bindir}/kuipc%{?compiler}
 %{_mandir}/man1/kuipc.1*
 
 %files packlib
 %defattr(-,root,root,-)
-%doc cernlib-2006.dfsg/debian/debhelper/zftp.README.debian
+%doc cernlib-2006.dfsg.2/debian/debhelper/zftp.README.debian
 %{_bindir}/cdbackup%{?compiler}
 %{_bindir}/cdserv%{?compiler}
 %{_bindir}/fatmen%{?compiler}
@@ -1112,7 +1102,7 @@
 %{_mandir}/man1/zftp.1*
 %{_mandir}/man8/*.8*
 
-%files -n patchy%{?compiler}
+%files -n %{?compat}patchy%{?compiler}
 %defattr(-,root,root,-)
 %{_bindir}/fcasplit%{?compiler}
 %{_bindir}/nycheck%{?compiler}
@@ -1141,6 +1131,10 @@
 
 
 %changelog
+* Sun May 13 2007 Patrice Dumas <pertusus at free.fr> 2006-9
+- add a compat prefix when built with g77
+- new debian patcheset
+
 * Tue Apr 24 2007 Patrice Dumas <pertusus at free.fr> 2006-8
 - change the soname with gfortran after coordination with debian maintainer
 


Index: paw-806-bump-mathlib-and-dependents-sonames.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/paw-806-bump-mathlib-and-dependents-sonames.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paw-806-bump-mathlib-and-dependents-sonames.dpatch	1 Sep 2006 13:15:22 -0000	1.1
+++ paw-806-bump-mathlib-and-dependents-sonames.dpatch	13 May 2007 23:30:30 -0000	1.2
@@ -13,7 +13,7 @@
  DoIncludePackage(paw)
  #include "paw/pilot.h"
  
-+export LIB_SONAME := 2
++export LIB_SONAME := 3
 +
  #define IHaveSubdirs
  #define PassCDebugFlags


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	21 Apr 2007 14:35:24 -0000	1.6
+++ sources	13 May 2007 23:30:30 -0000	1.7
@@ -1,6 +1,6 @@
-2dde98c3cbe839d07ce5dcb953f11b64  paw_2.14.04.dfsg-1.diff.gz
-1e654bb641c1a8af2ba655513665f936  mclibs_2006.dfsg-1.diff.gz
-51777e0bb52e104e3053615686f5a9be  cernlib_2006.dfsg-1.diff.gz
-ebcc69212a164a9f32f6706c26262747  geant321_3.21.14.dfsg-4.diff.gz
 fe71a3f6b95ff2151c5a4690116a0358  2006_src-free.tar.gz
 b1f550eedc545a02f0ab58eb7d550480  patchy.tar.gz
+c68f372589cb39f734cad81a2a52c895  cernlib_2006.dfsg.2-1.diff.gz
+c3133b7a5885bd1ee7e47d4f4e76beca  geant321_3.21.14.dfsg-5.diff.gz
+3978b81499f205062b540aa58bb79193  mclibs_2006.dfsg.2-1.diff.gz
+90982e80623338cf2d4b4a9efb445f8c  paw_2.14.04.dfsg.2-1.diff.gz


--- cernlib-fedora_script.patch DELETED ---


--- cernlib-fortify.patch DELETED ---


--- cernlib-soname.patch DELETED ---


