rpms/cernlib/FC-4 013-fix-paw-imakefile-special-rules-modified, NONE, 1.1 cernlib.spec, 1.6, 1.7

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	cernlib.spec 
Added Files:
	013-fix-paw-imakefile-special-rules-modified 
Log Message:
modify or remove debian patchs that requires the new imake rules
remove %{?_smp_mflags} from the library make and add it back to the paw make



--- NEW FILE 013-fix-paw-imakefile-special-rules-modified ---
diff -ur src/pawlib/paw.old/fmotif/Imakefile src/pawlib/paw/fmotif/Imakefile
--- src/pawlib/paw.old/fmotif/Imakefile	1996-09-23 10:20:46.000000000 -0400
+++ src/pawlib/paw/fmotif/Imakefile	2002-12-12 22:02:18.000000000 -0500
@@ -3,7 +3,7 @@
 	plotisto.F pmhist.F pminit.F show_chain.F
 
 #ifdef CERNLIB_LINUX
-FORTRANOPTIONS = -fno-backslash  $(FORTRANSAVEOPTION) -fno-second-underscore
+FORTRANOPTIONS = -g -fno-backslash  $(FORTRANSAVEOPTION) -fno-second-underscore
 #endif
 
 SubdirLibraryTarget(NullParameter,NullParameter)
diff -ur src/pawlib/paw.old/ntuple/Imakefile src/pawlib/paw/ntuple/Imakefile
--- src/pawlib/paw.old/ntuple/Imakefile	1999-09-14 05:20:08.000000000 -0400
+++ src/pawlib/paw/ntuple/Imakefile	2002-12-12 22:03:20.000000000 -0500
@@ -46,8 +46,8 @@
 
 SubdirLibraryTarget(NullParameter,NullParameter)
 
-#if defined(CERNLIB_LINUX) && defined(CERNLIB_PPC)
-SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -o $@)
-SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -o $@)
-SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -o $@)
+#if defined(CERNLIB_LINUX)
+SpecialObjectRule(archive/qp_execute.o,qp_execute.c archive/qp_execute.d,-O0 -g -o $@)
+SpecialObjectRule(debug/qp_execute.o,qp_execute.c debug/qp_execute.d,-O0 -g -o $@)
+SpecialObjectRule(shared/qp_execute.o,qp_execute.c shared/qp_execute.d,-O0 -g -fPIC -o $@)
 #endif


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cernlib.spec	18 Nov 2005 17:58:00 -0000	1.6
+++ cernlib.spec	21 Nov 2005 12:17:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       4%{?dist}.4
+Release:       4%{?dist}.5
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -73,7 +73,9 @@
 Patch5: 008-undef-PPC
 Patch6: 010-comis-allow-special-chars-in-path
 Patch7: 012-add-no-optimization-macro
+# not applied, requires debian imake rules
 Patch8: 013-fix-paw-imakefile-special-rules
+# not applied, requires debian imake rules
 Patch9: 014-fix-herwig-imakefile-special-rules
 Patch11: 015-fix-optimization
 # not applied, break build
@@ -115,6 +117,9 @@
 Patch45: 029-fixes-for-MacOSX
 Patch46: cernlib-config_pmac_comment_shift.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
+Patch48: 013-fix-paw-imakefile-special-rules-modified
 
 %description
 CERN program library is a large collection of general purpose libraries
@@ -228,8 +233,8 @@
 %patch -P 4
 %patch -P 5
 %patch -P 6
-%patch -P 7
-%patch -P 8
+#%patch -P 7
+#%patch -P 8
 %patch -P 9
 %patch -P 11
 #%patch -P 12
@@ -266,6 +271,7 @@
 %patch -P 45
 %patch -P 46
 %patch -P 47
+%patch -P 48
 
 
 %build
@@ -333,12 +339,12 @@
 # Install the libraries
 
 cd $CERN_ROOT/build
-make %{?_smp_mflags}
+#  %{?_smp_mflags} breaks the build
+make
 
 # Build paw
 cd $CERN_ROOT/build/pawlib
-#  %{?_smp_mflags} may break the build
-make install.bin
+make %{?_smp_mflags} install.bin
 
 # Build packlib
 cd $CERN_ROOT/build/packlib
@@ -437,11 +443,12 @@
 %doc debian/zftp.README.debian
 
 %changelog
-* Fri Nov 18 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.4
+* Mon Nov 21 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.5
 - 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
-- exclude x86_64 as f771 segfaults
+- exclude x86_64 as f771 segfaults on that target
+- modify or remove debian patchs that requires the new imake rules 
 
 * Tue Nov 15 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.1
 - add a .csh file