rpms/cernlib/devel patchy-unpack-rceta, NONE, 1.1 cernlib.spec, 1.23, 1.24 sources, 1.4, 1.5
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Wed Apr 12 17:42:16 UTC 2006
- Previous message (by thread): rpms/seamonkey/FC-4 seamonkey-configure.patch, 1.1, 1.2 seamonkey-mozconfig, 1.1, 1.2 seamonkey.spec, 1.2, 1.3
- Next message (by thread): rpms/openvpn/devel .cvsignore, 1.10, 1.11 openvpn.spec, 1.16, 1.17 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pertusus
Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19974
Modified Files:
cernlib.spec sources
Added Files:
patchy-unpack-rceta
Log Message:
* 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.
--- NEW FILE patchy-unpack-rceta ---
#! /bin/bash
set -e
cd .
file=patchy
script=rceta.sh
archive=$file.tar.gz
echo "Unpacking from $archive"
tar xzf $archive
echo "patching script"
sed -i -e 's/fort77/f77/' -e 's:^ rceta : ./rceta :' $file/$script
pushd $file
./$script
popd
echo "Repacking $archive"
tar czf $archive $file
exit 0
Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cernlib.spec 12 Apr 2006 06:53:13 -0000 1.23
+++ cernlib.spec 12 Apr 2006 17:42:16 -0000 1.24
@@ -1,6 +1,6 @@
Name: cernlib
Version: 2005
-Release: 15%{?dist}.1
+Release: 16%{?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,12 @@
# build the cernlib
BuildRequires: /usr/bin/g77
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if "%fedora" > "3"
+#%if "%fedora" > "3"
# f771 segfaults on x86_64
#ExcludeArch: x86_64
-%endif
+#%endif
# rceta segfaults on ppc
-ExcludeArch: 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
@@ -61,7 +61,15 @@
Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz
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
-# patchy 4 source files, provided by Mattias Ellert
+# The patchy version 4 sources
+Source300: 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.
+# I have recreated the patchy.tar.gz from Mattias tarball by running
+# sh patchy-unpack-rceta
+Source203: patchy-unpack-rceta
+
Source17: patchy.tar.gz
# Shell scripts that go in /etc/profile.d
@@ -339,13 +347,16 @@
%setup -T -D -a 17
# patch patchy 4 installer fortran generator script
+# avtually it is unusefull, because the unpacking has been done
+# offline, see comment above.
%patch -P 1500
%patch -P 1501
-# unpack the patchy version 4 sources
-pushd patchy
- ./rceta.sh
-popd
+# unpack the patchy version 4 sources is done offline,
+# see comment above
+#pushd patchy
+# ./rceta.sh
+#popd
%patch -P 1502
%patch -P 1503
@@ -816,6 +827,10 @@
%changelog
+* 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.
+
* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15.1
- add conditionals in spec to have only one for all fedora versions.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 11 Apr 2006 22:53:00 -0000 1.4
+++ sources 12 Apr 2006 17:42:16 -0000 1.5
@@ -13,4 +13,4 @@
67228b011eac13b44499c50219e21545 src_graflib.tar.gz
4fdcdc9f819ebbb9c6d3a04f339cdcf8 src_packlib.tar.gz
eecb52159458ead0ee6b0d00b90aab66 xsneut95.dat
-14e6f0dbc205ec4f106093ee27578273 patchy.tar.gz
+b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz
- Previous message (by thread): rpms/seamonkey/FC-4 seamonkey-configure.patch, 1.1, 1.2 seamonkey-mozconfig, 1.1, 1.2 seamonkey.spec, 1.2, 1.3
- Next message (by thread): rpms/openvpn/devel .cvsignore, 1.10, 1.11 openvpn.spec, 1.16, 1.17 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list