rpms/cernlib/devel cernlib.spec,1.26,1.27

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
- npatchy don't build on ppc.



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cernlib.spec	13 Apr 2006 12:42:53 -0000	1.26
+++ cernlib.spec	13 Apr 2006 15:34:44 -0000	1.27
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       16%{?dist}.2
+Release:       17%{?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.
@@ -32,12 +32,6 @@
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#%if "%fedora" > "3"
-# f771 segfaults on x86_64
-#ExcludeArch:   x86_64
-#%endif
-# rceta segfaults on ppc
-#ExcludeArch:   ppc
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -155,7 +149,7 @@
 Patch314: 314-permit-using-regcomp-for-re_comp.dpatch
 Patch315: 315-fixes-for-MacOSX.dpatch
 Patch318: 318-additional-gcc-3.4-fixes.dpatch
-# certainly not needed
+# certainly not needed, but who knows?
 Patch319: 319-work-around-imake-segfaults.dpatch
 
 Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch
@@ -171,8 +165,8 @@
 Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch
 Patch802: 802-create-shared-libraries.dpatch
 # in the original cernlib kxterm is built with the C compiler, which cause
-# a failure if compiled with de cernlib debian script as -lg2c isn't found. 
-# It is corrected by
+# a failure if compiled with the cernlib debian script as -lg2c isn't found. 
+# It is corrected in
 Patch803: 803-link-binaries-dynamically.dpatch
 # 803 depends on 
 # 208-fix-redundant-packlib-dependencies.dpatch
@@ -662,9 +656,12 @@
 cd $CERN_ROOT/build/packlib
 make %{?_smp_mflags} install.bin
 
-# Build patchy
+# Build npatchy
+# The build of patchy is completly messed up on ppc
+%ifnarch ppc
 cd $CERN_ROOT/build/patchy
 make %{?_smp_mflags} install.bin
+%endif
 
 %install
 
@@ -802,6 +799,7 @@
 
 %files -n patchy
 %defattr(-,root,root,-)
+%ifnarch ppc
 %{_bindir}/fcasplit
 %{_bindir}/nycheck
 %{_bindir}/nydiff
@@ -812,6 +810,7 @@
 %{_bindir}/nyshell
 %{_bindir}/nysynopt
 %{_bindir}/nytidy
+%endif
 %{_bindir}/ycompar
 %{_bindir}/yedit
 %{_bindir}/yexpand
@@ -829,7 +828,10 @@
 
 
 %changelog
-* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.2
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
+- npatchy don't build on ppc.
+
+* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16
 - unpack patchy offline because the files are within an unformatted
   fortran file which won't be right on all the arches.