Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21047
Modified Files:
ccpnmr-py.info
Log Message:
update to 2.3.0r2, use -j1 for c code to avoid race in Makefiles, fix order of
includes, fix linkage to only use gcc48-shlibs, tweak up optimization to -fOfast
Index: ccpnmr-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/ccpnmr-py.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ccpnmr-py.info 31 Mar 2013 15:03:53 -0000 1.4
+++ ccpnmr-py.info 27 Jun 2013 14:26:52 -0000 1.5
@@ -1,7 +1,7 @@
Info2: <<
Package: ccpnmr-py%type_pkg[python]
-Version: 2.2.2
-Revision: 3
+Version: 2.3.0r2
+Revision: 1
Type: python (2.6 2.7)
@@ -19,10 +19,10 @@
Source: http://www2.ccpn.ac.uk/download/ccpnmr/analysis%v.tar.gz
SourceDirectory: ccpnmr
-Source-MD5: a3ede39ed484d261eb82137055dc66a1
+Source-MD5: d5d9e2533bef28d2dcf9fda55e1704a1
PatchFile: ccpnmr-py.patch
-PatchFile-MD5: 1470c1c29df96e982db96389ee39bfb7
+PatchFile-MD5: f5e696ee6da81315c1e09fb7db1ad5bc
PatchScript: sed 's,@PREFIX@,%p,g' < %{PatchFile} | sed
's,python2.X,python%type_raw[python],g' | patch -p1
CompileScript: <<
@@ -30,7 +30,7 @@
export CCPNMR_TOP_DIR=%b
-cd $CCPNMR_TOP_DIR/ccpnmr2.2/c
+cd $CCPNMR_TOP_DIR/ccpnmr2.3/c
cp environment-opengl.txt environment.txt
@@ -38,7 +38,7 @@
perl -pi -e 's,-mtune=970\s-maltivec,,g' environment.txt
fi
-make
+make -j 1
make links
<<
InstallScript: <<
@@ -47,24 +47,24 @@
chmod 755 %i/lib/ccpnmr-py%type_pkg[python]/bin/*
-mkdir -p %i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.2
-cp -r %b/ccpnmr2.2/c
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.2/
-cp -r %b/ccpnmr2.2/python
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.2/
-echo 'ccpnmr/ccpnmr2.2/python' >
%i/lib/python%type_raw[python]/site-packages/ccpnmr.pth
+mkdir -p %i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.3
+cp -r %b/ccpnmr2.3/c
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.3/
+cp -r %b/ccpnmr2.3/python
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.3/
+echo 'ccpnmr/ccpnmr2.3/python' >
%i/lib/python%type_raw[python]/site-packages/ccpnmr.pth
-cp -r %b/ccpnmr2.2/data
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.2/
-cp -r %b/ccpnmr2.2/model
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.2/
+cp -r %b/ccpnmr2.3/data
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.3/
+cp -r %b/ccpnmr2.3/model
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.3/
-cp -r %b/ccpnmr2.2/doc
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.2/
+cp -r %b/ccpnmr2.3/doc
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.3/
cp -r %b/doc %i/lib/python%type_raw[python]/site-packages/ccpnmr/
-mkdir -p %i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.2/python/
-cp -r %b/ccpnmr2.2/python/doc
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.2/python/
+mkdir -p %i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.3/python/
+cp -r %b/ccpnmr2.3/python/doc
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.3/python/
-cd %i/lib/python%type_raw[python]/site-packages;
%p/bin/python%type_raw[python] -O %p/lib/python%type_raw[python]/compileall.py
ccpnmr/ccpnmr2.2
+cd %i/lib/python%type_raw[python]/site-packages;
%p/bin/python%type_raw[python] -O %p/lib/python%type_raw[python]/compileall.py
ccpnmr/ccpnmr2.3
<<
-DocFiles: ccpnmr2.2/license/CCPN.license ccpnmr2.2/license/LGPL.license
+DocFiles: ccpnmr2.3/license/CCPN.license ccpnmr2.3/license/LGPL.license
PostInstScript: <<
update-alternatives --install %p/bin/analysis analysis
%p/lib/ccpnmr-py%type_pkg[python]/bin/analysis 40
@@ -74,9 +74,9 @@
update-alternatives --install %p/bin/updateAll updateAll
%p/lib/ccpnmr-py%type_pkg[python]/bin/updateAll 40
update-alternatives --install %p/bin/updateCheck updateCheck
%p/lib/ccpnmr-py%type_pkg[python]/bin/updateCheck 40
-cd %p/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.2/c; make links
+cd %p/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.3/c; make links
-%p/bin/python%type_raw[python] -O
%p/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.2/python/ccpnmr/update/UpdateAuto.py
+%p/bin/python%type_raw[python] -O
%p/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.3/python/ccpnmr/update/UpdateAuto.py
<<
PreRmScript: <<
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
