Update of /cvsroot/fink/experimental/danielj
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10543
Modified Files:
python32.info
Log Message:
Overhaul python packaging to use Type: python to reduce differences between
info files. Also enable tests on python32.
Index: python32.info
===================================================================
RCS file: /cvsroot/fink/experimental/danielj/python32.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- python32.info 10 Aug 2010 20:09:13 -0000 1.1
+++ python32.info 13 Aug 2010 16:08:34 -0000 1.2
@@ -1,6 +1,8 @@
-Package: python32
+Info2: <<
+Package: python%type_pkg[python]
Version: 3.2
Revision: 0.a1.1
+Type: python 3.2
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
Depends: <<
%N-shlibs (= %v-%r),
@@ -50,29 +52,30 @@
fi
%{default_script}
<<
+InfoTest: TestScript: ./runtests.sh || exit 2
InstallScript: <<
#!/bin/sh -ex
make install DESTDIR=%d
# don't propagate our hackery
- perl -pi -e 's|-L%p/lib/system-openssl/lib||'
%i/lib/python3.2/config/Makefile
+ perl -pi -e 's|-L%p/lib/system-openssl/lib||'
%i/lib/python%type_raw[python]/config/Makefile
# fix all main things to be python-versioned filenames with
# unversioned symlinks to them
pushd %i/bin
for f in 2to3 idle3 pydoc3; do
- mv ${f} ${f}-3.2
- ln -s ${f}-3.2 %i/bin/${f}
+ mv ${f} ${f}-%type_raw[python]
+ ln -s ${f}-%type_raw[python] %i/bin/${f}
done
#Remove this for now to avoid conflicting with 'python' package.
rm 2to3
popd
- ln -s python3.2.1 %i/share/man/man1/python3.1
+ ln -s python%type_raw[python].1 %i/share/man/man1/python3.1
# install some docs and other useful tidbits
rm -rf Misc/RPM
- /bin/cp -R Misc Tools %i/lib/python3.2
+ /bin/cp -R Misc Tools %i/lib/python%type_raw[python]
mkdir -p %i/share/doc/%n
/bin/cp -R Demo Doc %i/share/doc/%n
# No html docs yet.
@@ -82,7 +85,7 @@
SplitOff: <<
Package: %N-shlibs
Depends: libgettext8-shlibs
- Files: lib/python3.2/config/libpython3.2.dylib
+ Files: lib/python%type_raw[python]/config/libpython%type_raw[python].dylib
Shlibs: %p/lib/python3.2/config/libpython3.2.dylib 3.2.0 %n (>= 3.2-0.a1.1)
DocFiles: README LICENSE
<<
@@ -98,7 +101,7 @@
share/man/man1/python3.1
<<
DocFiles: README LICENSE
- Description: Generic "python3" command that invokes python31
+ Description: Generic "python3" command that invokes python%type_pkg[python]
<<
DocFiles: README LICENSE
Description: Interpreted, object-oriented language
@@ -107,14 +110,14 @@
This package installs unix python - not the OSX Framework version.
Builds a two-level namespace dynamic libpython (needed for koffice).
- The interpretter is installed as "python3.2", and all associated
+ The interpretter is installed as "python%type_raw[python]", and all associated
commands are similarly named with the python-version in them. To get
the simple "python3" command, install the fink package "python3" (note:
- the "python3" command there is not guaranteed to be python3.1!).
+ the "python3" command there is not guaranteed to be python%type_raw[python]!).
<<
DescUsage: <<
- python3.2 changes the compiler options used to compile
- third-party python modules. Please do not add 3.2 variants
+ python%type_raw[python] changes the compiler options used to compile
+ third-party python modules. Please do not add %type_raw[python] variants
to them without actually testing that they build cleanly.
<<
@@ -129,7 +132,7 @@
Continue this practice so that -pyXX varianted packages don't
need special-casing for certain variants.
- Make sure all compiled modules link against libpython3.2 (and
+ Make sure all compiled modules link against libpython%type_raw[python]
(and
propagate this to third-party compiled modules) to ensure that
all symbols resolved at compile-time to avoid packager
mistakes and user runtime surprises.
@@ -159,3 +162,4 @@
<<
License: OSI-Approved
Homepage: http://www.python.org
+<<
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
