Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv1996

Modified Files:
        ccpnmr-py.info ccpnmr-py.patch 
Log Message:
New upstream from maintainer.

Index: ccpnmr-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccpnmr-py.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ccpnmr-py.patch     23 Apr 2009 22:19:45 -0000      1.10
+++ ccpnmr-py.patch     26 Jul 2011 17:48:42 -0000      1.11
@@ -1,181 +1,124 @@
-diff -urN ccpnmr.orig/bin/analysis ccpnmr/bin/analysis
---- ccpnmr.orig/bin/analysis   1970-01-01 01:00:00.000000000 +0100
-+++ ccpnmr/bin/analysis        2005-12-23 20:42:39.000000000 +0000
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+export MallocLogFile=/dev/null
-+
-+if [ ${SSH_TTY} ]; then
-+    export LIBGL_ALWAYS_INDIRECT=1
-+fi
-+
-+@PREFIX@/bin/python2.X -i -O 
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.0/python/ccpnmr/analysis/AnalysisGui.py
 $1 $2 $3 $4 $5
-diff -urN ccpnmr.orig/bin/formatConverter ccpnmr/bin/formatConverter
---- ccpnmr.orig/bin/formatConverter    1970-01-01 01:00:00.000000000 +0100
-+++ ccpnmr/bin/formatConverter 2005-12-23 20:44:06.000000000 +0000
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+export MallocLogFile=/dev/null
-+
-+if [ ${SSH_TTY} ]; then
-+    export LIBGL_ALWAYS_INDIRECT=1
-+fi
-+
-+@PREFIX@/bin/python2.X -O 
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr1.0/python/ccpnmr/format/gui/FormatConverter.py
 $1 $2
-diff -urN ccpnmr.orig/bin/pipe2azara ccpnmr/bin/pipe2azara
---- ccpnmr.orig/bin/pipe2azara 1970-01-01 01:00:00.000000000 +0100
-+++ ccpnmr/bin/pipe2azara      2005-12-23 20:44:06.000000000 +0000
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+export MallocLogFile=/dev/null
-+
-+if [ ${SSH_TTY} ]; then
-+    export LIBGL_ALWAYS_INDIRECT=1
-+fi
-+
-+@PREFIX@/bin/python2.X -O 
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr1.0/python/ccpnmr/analysis/NmrPipeData.py
 $1 $2 $3
-diff -urN ccpnmr.orig/ccpnmr2.0/c/environment-opengl.txt 
ccpnmr/ccpnmr1.0/c/environment-opengl.txt
---- ccpnmr.orig/ccpnmr2.0/c/environment-opengl.txt     1970-01-01 
01:00:00.000000000 +0100
-+++ ccpnmr/ccpnmr2.0/c/environment-opengl.txt  2005-12-23 21:37:59.000000000 
+0000
-@@ -0,0 +1,44 @@
-+#Environment file for use with fink to build ccpnmr suite - environment.txt
-+
-+CC = gcc
-+
-+MALLOC_FLAG = -DDO_NOT_HAVE_MALLOC
-+FPIC_FLAG = -fPIC
-+CFLAGS = -O3 $(MALLOC_FLAG) $(FPIC_FLAG) -fno-common -ffast-math -mtune=970 
-maltivec
-+
-+GL_FLAG = -DUSE_GL_TRUE
-+#GL_FLAG = -DUSE_GL_FALSE
-+
-+#GLUT_NEED_INIT =
-+GLUT_NEED_INIT = -DNEED_GLUT_INIT
-+#GLUT_NOT_IN_GL = -DGLUT_IN_OWN_DIR
-+GLUT_FLAG = $(GLUT_NEED_INIT) $(GLUT_NOT_IN_GL)
-+
-+SHARED_FLAGS = -L@PREFIX@/lib -bundle -bundle_loader @PREFIX@/bin/python2.X 
"-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
-+
-+MATH_LIB = -lm
-+
-+X11_DIR = /usr/X11R6
-+X11_LIB = -lX11 -lXext
-+X11_INCLUDE_FLAGS = -I$(X11_DIR)/include
-+X11_LIB_FLAGS = -L$(X11_DIR)/lib
-+
-+TCL_DIR = @PREFIX@
-+TCL_LIB = -ltcl
-+TCL_INCLUDE_FLAGS = -I$(TCL_DIR)/include
-+TCL_LIB_FLAGS = -L$(TCL_DIR)/lib
-+
-+TK_DIR = @PREFIX@
-+TK_LIB = -ltk
-+TK_INCLUDE_FLAGS = -I$(TK_DIR)/include
-+TK_LIB_FLAGS = -L$(TK_DIR)/lib
-+
-+PYTHON_DIR = @PREFIX@
-+PYTHON_LIB = 
-+PYTHON_INCLUDE_FLAGS = -I$(PYTHON_DIR)/include/python2.X
-+PYTHON_LIB_FLAGS = -L@PREFIX@/lib/python2.X/config -lpython2.X
-+
-+GL_DIR = /usr/X11R6
-+GL_LIB = -lfreeglut -lGLU -lGL
-+GL_INCLUDE_FLAGS = -I$(GL_DIR)/include -I@PREFIX@/include
-+GL_LIB_FLAGS = -L$(GL_DIR)/lib -L@PREFIX@/lib
-diff -urN ccpnmr.orig/ccpnmr2.0/c/ccp/structure/Makefile 
ccpnmr/ccpnmr1.0/c/ccp/structure/Makefile
---- ccpnmr.orig/ccpnmr2.0/c/ccp/structure/Makefile     2006-01-13 
21:52:17.000000000 +0000
-+++ ccpnmr/ccpnmr2.0/c/ccp/structure/Makefile  2006-01-13 21:56:46.000000000 
+0000
-@@ -35,11 +35,11 @@
-       $(GLOBAL_DIR)/py_ps_handler.o \
-       $(GLOBAL_DIR)/py_tk_handler.o
- 
--ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
-+ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) 
$(PYTHON_INCLUDE_FLAGS) \
-       $(X11_INCLUDE_FLAGS) \
--      $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
-+      $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
- 
--ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) 
$(GL_LIB_FLAGS)
-+ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) 
$(TK_LIB_FLAGS)
- 
- ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
- 
-diff -urN ccpnmr.orig/ccpnmr2.0/c/ccpnmr/analysis/Makefile 
ccpnmr/ccpnmr1.0/c/ccpnmr/analysis/Makefile
---- ccpnmr.orig/ccpnmr2.0/c/ccpnmr/analysis/Makefile   2006-01-13 
21:52:45.000000000 +0000
-+++ ccpnmr/ccpnmr2.0/c/ccpnmr/analysis/Makefile        2006-01-13 
21:57:29.000000000 +0000
-@@ -40,11 +40,11 @@
-       $(GLOBAL_DIR)/py_ps_handler.o \
-       $(GLOBAL_DIR)/py_tk_handler.o
- 
--ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
-+ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) 
$(PYTHON_INCLUDE_FLAGS) \
-       $(X11_INCLUDE_FLAGS) \
--      $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
-+      $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
- 
--ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) 
$(GL_LIB_FLAGS)
-+ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) 
$(TK_LIB_FLAGS)
- 
- ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
- 
-diff -urN ccpnmr.orig/ccpnmr2.0/c/memops/global/Makefile 
ccpnmr/ccpnmr1.0/c/memops/global/Makefile
---- ccpnmr.orig/ccpnmr2.0/c/memops/global/Makefile     2006-01-13 
20:57:07.000000000 +0000
-+++ ccpnmr/ccpnmr2.0/c/memops/global/Makefile  2006-01-13 20:59:57.000000000 
+0000
-@@ -99,10 +99,10 @@
- 
- TCLTK_LIB = $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
- 
--ALL_INCLUDE_FLAGS = $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
--      $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
-+ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) 
$(X11_INCLUDE_FLAGS) \
-+      $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
- 
--ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) 
$(GL_LIB_FLAGS)
-+ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) 
$(TK_LIB_FLAGS)
- 
- ALL_LIB = $(GL_LIB) $(TK_LIB) $(TCL_LIB) $(X11_LIB) $(MATH_LIB)
- 
-Binary files ccpnmr.orig/.DS_Store and ccpnmr/.DS_Store differ
-Binary files ccpnmr.orig/bin/.DS_Store and ccpnmr/bin/.DS_Store differ
-diff -urN ccpnmr.orig/bin/dataShifter ccpnmr/bin/dataShifter
---- ccpnmr.orig/bin/dataShifter        1970-01-01 01:00:00.000000000 +0100
-+++ ccpnmr/bin/dataShifter     2008-03-24 19:03:07.000000000 +0000
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+export MallocLogFile=/dev/null
-+
-+if [ ${SSH_TTY} ]; then
-+    export LIBGL_ALWAYS_INDIRECT=1
-+fi
-+
-+@PREFIX@/bin/python2.5 -O 
@PREFIX@/lib/python2.5/site-packages/ccpnmr/ccpnmr2.0/python/ccpnmr/format/gui/DataShifter.py
-diff -urN ccpnmr.orig/bin/updateAll ccpnmr/bin/updateAll
---- ccpnmr.orig/bin/updateAll  1970-01-01 01:00:00.000000000 +0100
-+++ ccpnmr/bin/updateAll       2008-03-24 19:04:31.000000000 +0000
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+export MallocLogFile=/dev/null
-+
-+if [ ${SSH_TTY} ]; then
-+    export LIBGL_ALWAYS_INDIRECT=1
-+fi
-+
-+@PREFIX@/bin/python2.5 -i -O 
@PREFIX@/lib/python2.5/site-packages/ccpnmr/ccpnmr2.0/python/ccpnmr/update/UpdateAuto.py
-diff -urN ccpnmr.orig/bin/updateCheck ccpnmr/bin/updateCheck
---- ccpnmr.orig/bin/updateCheck        1970-01-01 01:00:00.000000000 +0100
-+++ ccpnmr/bin/updateCheck     2008-03-24 19:06:16.000000000 +0000
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+export MallocLogFile=/dev/null
-+
-+if [ ${SSH_TTY} ]; then
-+    export LIBGL_ALWAYS_INDIRECT=1
-+fi
-+
-+@PREFIX@/bin/python2.5 -i -O 
@PREFIX@/lib/python2.5/site-packages/ccpnmr/ccpnmr2.0/python/ccpnmr/update/UpdatePopup.py
+Info2: <<
+Package: ccpnmr-py%type_pkg[python]
+Version: 2.1.5
+Revision: 1
+
+Type: python (2.5 2.6 2.7)
+
+Maintainer: Jack Howarth <howa...@bromo.med.uc.edu>
+
+Depends: python%type_pkg[python], x11, tcltk, freeglut-shlibs, gcc46-shlibs, 
scipy-py%type_pkg[python]
+BuildDepends: x11-dev, tcltk-dev, freeglut, gcc46, fink (>= 0.24.12)
+Recommends: ccpnmr-py%type_pkg[python]-bin
+Conflicts: ccpnmr-opengl-py%type_pkg[python], ccpnmr-mesa-py%type_pkg[python], 
ccpnmr-py23, ccpnmr-py24, ccpnmr-py25, ccpnmr-py26, ccpnmr-py27, 
ccpnmr-py23-bin, ccpnmr-py24-bin, ccpnmr-py25-bin
+Replaces: ccpnmr-opengl-py%type_pkg[python], ccpnmr-mesa-py%type_pkg[python], 
ccpnmr-py23, ccpnmr-py24, ccpnmr-py25, ccpnmr-py26, ccpnmr-py27, 
ccpnmr-py23-bin, ccpnmr-py24-bin, ccpnmr-py25-bin
+
+Description: NMR Software Suite (using OpenGL)
+Homepage: http://www.ccpn.ac.uk/ccpn_suite/ccpn_suite.html
+License: LGPL
+
+Source: http://www.bio.cam.ac.uk/ccpn/download/ccpnmr/analysis%v.tar.gz
+SourceDirectory: ccpnmr
+Source-MD5: e1e93cac7516c6f8fbe4b503a223cdd4
+
+PatchFile: ccpnmr-py.patch
+PatchFile-MD5: 591cb21ab10aa5c65f6dbbe06803c687 
+PatchScript: sed 's,@PREFIX@,%p,g' < %{PatchFile} | sed 
's,python2.X,python%type_raw[python],g' | patch -p1
+
+CompileScript: <<
+#!/bin/sh -ev
+
+export CCPNMR_TOP_DIR=%b
+
+cd $CCPNMR_TOP_DIR/ccpnmr2.1/c
+
+cp environment-opengl.txt environment.txt
+
+if [ %m != "powerpc" ]; then 
+perl -pi -e 's,-mtune=970\s-maltivec,,g' environment.txt
+fi
+
+make
+make links
+<<
+InstallScript: <<
+mkdir -p %i/lib/ccpnmr-py%type_pkg[python]/bin
+cp %b/bin/* %i/lib/ccpnmr-py%type_pkg[python]/bin/
+
+chmod 755 %i/lib/ccpnmr-py%type_pkg[python]/bin/*
+
+mkdir -p %i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1
+cp -r %b/ccpnmr2.1/c 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/
+cp -r %b/ccpnmr2.1/python 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/
+echo 'ccpnmr/ccpnmr2.1/python' > 
%i/lib/python%type_raw[python]/site-packages/ccpnmr.pth
+
+cp -r %b/ccpnmr2.1/data 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/
+cp -r %b/ccpnmr2.1/model 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/
+
+cp -r %b/ccpnmr2.1/doc 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/
+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.1/python/
+cp -r %b/ccpnmr2.1/python/doc 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/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.1
+<<
+
+DocFiles: ccpnmr2.1/license/CCPN.license ccpnmr2.1/license/LGPL.license
+
+PostInstScript: <<
+update-alternatives --install %p/bin/analysis analysis 
%p/lib/ccpnmr-py%type_pkg[python]/bin/analysis 40
+update-alternatives --install %p/bin/formatConverter formatConverter 
%p/lib/ccpnmr-py%type_pkg[python]/bin/formatConverter 40
+update-alternatives --install %p/bin/pipe2azara pipe2azara 
%p/lib/ccpnmr-py%type_pkg[python]/bin/pipe2azara 40
+update-alternatives --install %p/bin/dataShifter dataShifter 
%p/lib/ccpnmr-py%type_pkg[python]/bin/dataShifter 40
+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.1/c; make links
+
+# updating appears broken
+#%p/bin/python%type_raw[python] -O 
%p/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/python/ccpnmr/update/UpdateAuto.py
+<<
+
+PreRmScript: <<
+if [ "$1" != "upgrade" ]; then
+      update-alternatives --remove analysis 
%p/lib/ccpnmr-py%type_pkg[python]/bin/analysis
+      update-alternatives --remove formatConverter 
%p/lib/ccpnmr-py%type_pkg[python]/bin/formatConverter
+      update-alternatives --remove pipe2azara 
%p/lib/ccpnmr-py%type_pkg[python]/bin/pipe2azara
+      update-alternatives --remove dataShifter 
%p/lib/ccpnmr-py%type_pkg[python]/bin/dataShifter
+      update-alternatives --remove updateAll 
%p/lib/ccpnmr-py%type_pkg[python]/bin/updateAll
+      update-alternatives --remove updateCheck 
%p/lib/ccpnmr-py%type_pkg[python]/bin/updateCheck
+fi
+  <<
+
+PostRmScript: <<
+if [ "$1" != "upgrade" ]; then
+    if [ -d  %p/lib/python%type_raw[python]/site-packages/ccpnmr ]; 
+        then rm -r %p/lib/python%type_raw[python]/site-packages/ccpnmr; 
+    fi
+fi
+<<
+
+DescDetail: <<
+The CcpNmr software suite is a series of programs for 
+macromolecular NMR spectroscopy integrated with the 
+CCP data model. The CCP Data Model for macromolecular 
+NMR is intended to cover all data needed for macromolecular 
+NMR spectroscopy from the initial experimental data to 
+the final validation. It serves for exchange of data 
+between programs, for storage, data harvesting, and 
+database deposition. 
+<<
+DescUsage: <<
+If Fink is properly installed and your environment 
+variables, such as PATH, etc. are set properly, you
+should be able to run CcpNmr software, after installation,
+by calling the command analysis or formatConverter in an 
+xterm or terminal window.
+
+After installation, you can't use the same window to run
+analysis or formatConverter. You need to use a new xterm
+window or terminal window for the path to the commands to
+be sourced.
+<<
+<<

Index: ccpnmr-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccpnmr-py.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ccpnmr-py.info      10 Sep 2009 17:43:02 -0000      1.20
+++ ccpnmr-py.info      26 Jul 2011 17:48:42 -0000      1.21
@@ -1,17 +1,17 @@
 Info2: <<
 Package: ccpnmr-py%type_pkg[python]
-Version: 2.0.7.1
+Version: 2.1.5
 Revision: 1
 
-Type: python (2.5 2.6)
+Type: python (2.5 2.6 2.7)
 
-Maintainer: None <fink-de...@lists.sourceforge.net>
+Maintainer: Jack Howarth <howa...@bromo.med.uc.edu>
 
-Depends: python%type_pkg[python], x11, tcltk, freeglut-shlibs, 
scipy-core-py%type_pkg[python]
-BuildDepends: x11-dev, tcltk-dev, freeglut, fink (>= 0.24.12)
+Depends: python%type_pkg[python], x11, tcltk, freeglut-shlibs, gcc46-shlibs, 
scipy-py%type_pkg[python]
+BuildDepends: x11-dev, tcltk-dev, freeglut, gcc46, fink (>= 0.24.12)
 Recommends: ccpnmr-py%type_pkg[python]-bin
-Conflicts: ccpnmr-opengl-py%type_pkg[python], ccpnmr-mesa-py%type_pkg[python], 
ccpnmr-py23, ccpnmr-py24, ccpnmr-py25, ccpnmr-py23-bin, ccpnmr-py24-bin, 
ccpnmr-py25-bin
-Replaces: ccpnmr-opengl-py%type_pkg[python], ccpnmr-mesa-py%type_pkg[python], 
ccpnmr-py23, ccpnmr-py24, ccpnmr-py25, ccpnmr-py23-bin, ccpnmr-py24-bin, 
ccpnmr-py25-bin
+Conflicts: ccpnmr-opengl-py%type_pkg[python], ccpnmr-mesa-py%type_pkg[python], 
ccpnmr-py23, ccpnmr-py24, ccpnmr-py25, ccpnmr-py26, ccpnmr-py27, 
ccpnmr-py23-bin, ccpnmr-py24-bin, ccpnmr-py25-bin
+Replaces: ccpnmr-opengl-py%type_pkg[python], ccpnmr-mesa-py%type_pkg[python], 
ccpnmr-py23, ccpnmr-py24, ccpnmr-py25, ccpnmr-py26, ccpnmr-py27, 
ccpnmr-py23-bin, ccpnmr-py24-bin, ccpnmr-py25-bin
 
 Description: NMR Software Suite (using OpenGL)
 Homepage: http://www.ccpn.ac.uk/ccpn_suite/ccpn_suite.html
@@ -19,10 +19,10 @@
 
 Source: http://www.bio.cam.ac.uk/ccpn/download/ccpnmr/analysis%v.tar.gz
 SourceDirectory: ccpnmr
-Source-MD5: bc96793b01cc78891c6e52bf8fcf905a
+Source-MD5: e1e93cac7516c6f8fbe4b503a223cdd4
 
 PatchFile: ccpnmr-py.patch
-PatchFile-MD5: d120be473699966fe6a7cf201f54ccc3
+PatchFile-MD5: 591cb21ab10aa5c65f6dbbe06803c687 
 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.0/c
+cd $CCPNMR_TOP_DIR/ccpnmr2.1/c
 
 cp environment-opengl.txt environment.txt
 
@@ -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.0
-cp -r %b/ccpnmr2.0/c 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.0/
-cp -r %b/ccpnmr2.0/python 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.0/
-echo 'ccpnmr/ccpnmr2.0/python' > 
%i/lib/python%type_raw[python]/site-packages/ccpnmr.pth
+mkdir -p %i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1
+cp -r %b/ccpnmr2.1/c 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/
+cp -r %b/ccpnmr2.1/python 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/
+echo 'ccpnmr/ccpnmr2.1/python' > 
%i/lib/python%type_raw[python]/site-packages/ccpnmr.pth
 
-cp -r %b/ccpnmr2.0/data 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.0/
-cp -r %b/ccpnmr2.0/model 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.0/
+cp -r %b/ccpnmr2.1/data 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/
+cp -r %b/ccpnmr2.1/model 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/
 
-cp -r %b/ccpnmr2.0/doc 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.0/
+cp -r %b/ccpnmr2.1/doc 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/
 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.0/python/
-cp -r %b/ccpnmr2.0/python/doc 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.0/python/
+mkdir -p %i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/python/
+cp -r %b/ccpnmr2.1/python/doc 
%i/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/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.0
+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.1
 <<
 
-DocFiles: ccpnmr2.0/license/CCPN.license ccpnmr2.0/license/LGPL.license
+DocFiles: ccpnmr2.1/license/CCPN.license ccpnmr2.1/license/LGPL.license
 
 PostInstScript: <<
 update-alternatives --install %p/bin/analysis analysis 
%p/lib/ccpnmr-py%type_pkg[python]/bin/analysis 40
@@ -74,9 +74,10 @@
 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.0/c; make links
+cd %p/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/c; make links
 
-%p/bin/python%type_raw[python] -O 
%p/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.0/python/ccpnmr/update/UpdateAuto.py
+# updating appears broken
+#%p/bin/python%type_raw[python] -O 
%p/lib/python%type_raw[python]/site-packages/ccpnmr/ccpnmr2.1/python/ccpnmr/update/UpdateAuto.py
 <<
 
 PreRmScript: <<


------------------------------------------------------------------------------
Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to