rpms/cernlib/FC-4 cernlib.spec,1.5,1.6

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
add patch for use of regcomp instead of regcmp.
exclude x86_64 as f771 segfaults on that platform.




Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/FC-4/cernlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cernlib.spec	18 Nov 2005 16:45:31 -0000	1.5
+++ cernlib.spec	18 Nov 2005 17:58:00 -0000	1.6
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       4%{?dist}.3
+Release:       4%{?dist}.4
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -17,6 +17,8 @@
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# f771 segfaults on x86_64
+ExcludeArch:   x86_64
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -112,7 +114,7 @@
 Patch44: cernlib-bimsel-nodouble-save.diff
 Patch45: 029-fixes-for-MacOSX
 Patch46: cernlib-config_pmac_comment_shift.diff
-
+Patch47: 032-use-regcomp-not-re_comp
 
 %description
 CERN program library is a large collection of general purpose libraries
@@ -263,6 +265,7 @@
 # try to build on ppc
 %patch -P 45
 %patch -P 46
+%patch -P 47
 
 
 %build
@@ -330,8 +333,7 @@
 # Install the libraries
 
 cd $CERN_ROOT/build
-#  %{?_smp_mflags} breaks the build
-make
+make %{?_smp_mflags}
 
 # Build paw
 cd $CERN_ROOT/build/pawlib
@@ -435,9 +437,11 @@
 %doc debian/zftp.README.debian
 
 %changelog
-* Fri Nov 18 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.3
+* Fri Nov 18 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.4
 - add debian patch for MacOSX that could have fixed the PPC build
-- add a patch that comment out the CERNLIB_SHIFT define
+- 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
 
 * Tue Nov 15 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-4.1
 - add a .csh file