Hanspeter,
For clarity here are the differences from the current packaging..
--- wxpython300-py.info 2015-02-07 14:44:26.000000000 -0500
+++ wxpython300-py.info.new 2015-02-07 13:36:16.000000000 -0500
@@ -2,7 +2,7 @@
Package: wxpython300-py%type_pkg[python]
Version: 3.0.2.0
-Revision: 2
+Revision: 3
Type: python (2.7)
Maintainer: Jack Howarth <[email protected]>
BuildDepends: <<
@@ -11,10 +11,9 @@
<<
Depends: <<
python%type_pkg[python],
+ wxversion,
wxwidgets300-osxcocoa-shlibs
<<
-Conflicts: wxgtk2.8-py27
-Replaces: wxgtk2.8-py27
Source: mirror:sourceforge:wxpython/%v/wxPython-src-%v.tar.bz2
Source-MD5: 922b02ff2c0202a7bf1607c98bbbbc04
PatchFile: wxpython300-py.patch
@@ -32,6 +31,10 @@
cp -R %b/demo %i/share/doc/%n
cp -R %b/samples %i/share/doc/%n
/usr/bin/find %i -type f -name "*.py" -exec perl -pi -e
's|/usr/bin/env python|%p/bin/python%type_raw[python]|g' {} \;
+
+ mv %i/lib/python%type_raw[python]/site-packages/wx.pth
%i/lib/python%type_raw[python]/site-packages/wx3.0.pth
+ ln -s %p/lib/python%type_raw[python]/site-packages/wx3.0.pth
%i/lib/python%type_raw[python]/site-packages/wx.pth
+
<<
Description: Python bindings for the wxGTK library
@@ -67,8 +70,15 @@
Replaces: wxpython-py23-dev, wxpython-py24-dev, wxpython-py25-dev,
wxpython-py26-dev, wxpython-py27-dev, wxgtk2.8-py-dev
Depends: wxpython300-py%type_pkg[python] (= %v-%r)
BuildDependsOnly: true
- Files: include
+ Files: include lib/python%type_raw[python]/site-packages/wx.pth
DocFiles: ../docs/preamble.txt ../docs/gpl.txt ../docs/licence.txt
../docs/lgpl.txt docs/*.txt
<<
+SplitOff2: <<
+ Package: wxversion
+ Depends: python%type_pkg[python]
+ Files: lib/python%type_raw[python]/site-packages/wxversion.py*
+ DocFiles: ../docs/preamble.txt ../docs/gpl.txt
../docs/licence.txt ../docs/lgpl.txt docs/*.txt
+<<
+
<<
--- wxgtk2.8-py.info 2015-02-07 14:44:26.000000000 -0500
+++ wxgtk2.8-py.info.new 2015-02-07 14:00:36.000000000 -0500
@@ -2,7 +2,7 @@
Package: wxgtk2.8-py%type_pkg[python]
Version: 2.8.12.1
-Revision: 5
+Revision: 6
Type: python (2.7)
Maintainer: Jack Howarth <[email protected]>
BuildDepends: <<
@@ -23,11 +23,10 @@
gtk+2-shlibs (>= 2.18.0-1),
python%type_pkg[python],
wxgtk2.8-shlibs (>= 2.8.12-6),
+ wxversion,
opengl-py%type_pkg[python] (>= 3.0.1-1),
x11
<<
-Conflicts: wxpython300-py27
-Replaces: wxpython300-py27
Source: mirror:sourceforge:wxpython/wxPython-src-%v.tar.bz2
Source-MD5: 8c06c5941477beee213b4f2fa78be620
SourceDirectory: wxPython-src-%v/wxPython
@@ -46,6 +45,9 @@
cp -R demo %i/share/doc/%n
cp -R samples %i/share/doc/%n
/usr/bin/find %i -type f -name "*.py" -exec perl -pi -e
's|/usr/bin/env python|%p/bin/python%type_raw[python]|g' {} \;
+
+ mv %i/lib/python%type_raw[python]/site-packages/wx.pth
%i/lib/python%type_raw[python]/site-packages/wx2.8.pth
+ ln -s %p/lib/python%type_raw[python]/site-packages/wx2.8.pth
%i/lib/python%type_raw[python]/site-packages/wx.pth
<<
PostInstScript: <<
@@ -112,7 +114,14 @@
Replaces: wxpython-py23-dev, wxpython-py24-dev, wxpython-py25-dev,
wxpython-py26-dev, wxpython-py27-dev, wxpython300-py27-dev
Depends: wxgtk2.8-py%type_pkg[python] (= %v-%r)
BuildDependsOnly: true
- Files: include
+ Files: include lib/python%type_raw[python]/site-packages/wx.pth
+ DocFiles: ../docs/preamble.txt ../docs/gpl.txt ../docs/licence.txt
../docs/lgpl.txt docs/*.txt
+<<
+
+SplitOff2: <<
+ Package: wxversion
+ Depends: python%type_pkg[python]
+ Files: lib/python%type_raw[python]/site-packages/wxversion.py*
DocFiles: ../docs/preamble.txt ../docs/gpl.txt ../docs/licence.txt
../docs/lgpl.txt docs/*.txt
<<
Jack
On Sat, Feb 7, 2015 at 2:31 PM, Jack Howarth <[email protected]> wrote:
> Hanspeter,
> Try the attached packaging. It implements the debian
> approach for allowing the wxpython 2.8 and 3.0 packages to co-exist as
> closely as we can in fink. They use an extra /usr/lib/wx/python
> directory, update-alternatives and a dh*py* tool to manage the
> symlinks in concert with changes to their python which we don't have.
>
> https://wiki.debian.org/Python/TransitionToDHPython2
>
> In our case, we are able to create the same common 'wxversion'
> split-off containing the
> lib/python%type_raw[python]/site-packages/wxversion.py* files. However
> in the absence of the additional support from their
> TransitionToDHPython2 project, we have to explicitly store the symlink
> for the correct wx*.pth file in the appropriate -dev split.off. This
> does cause some grief in upgrading from the current wxgtk28-py and
> wxpython300-py due to the movement of wx.pth file into the -dev
> split-off but it is a one time deal and afterwards the two wxpython
> packages will freely co-exist.
> Packages that currently BuildDepends on wxgtk28-py27 or
> wxpython300-py27 now need to use wxgtk28-py27-dev or
> wxpython300-py27-dev instead in order to get the correct wx*.pth
> symlink. I've tested this with the modified bibus.info and
> relax-py.info files. They build fine and can both run with issues when
> the wxgtk28-py27-dev and wxpython300-py27-dev packages are
> deinstaleld.
> Jack
> ps The correct wx,path has to be used because the one from
> wxgtk28-py27 contains the string "wx-2.8-gtk2-unicode" and the one
> from the wxpython300-py27-dev contains the string "wx-3.0-osx_cocoa".
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Fink-devel mailing list
[email protected]
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel
