X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59455c67d444c12f6d6a59e0c16528554c8b4c30..4f60dce5d49d3a5f38d93c867bd3527fe60e1aec:/wxPython/distrib/wxPythonFull.spec.in?ds=inline

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 32ab340a9e..0c4e78f163 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -1,113 +1,203 @@
-%define pref 	%{_prefix}
-%define python 	@PYTHON@
-%define pyver 	@PYVER@
-%define port  	@PORT@
-%define lcport 	@LCPORT@
-%define unicode @UNICODE@
-%define tarname @TARNAME@
-%define version @VERSION@
-%define ver2    @VER2@
-%define release 1
-%define wxprefbase %{pref}/lib/wxPython
-%define wxpref  %{wxprefbase}-%{version}
-%define name    wxPython%{port}-py%{pyver}
+#----------------------------------------------------------------------
+# Name:        wxPython.spec
+# Purpose:     RPM Build and packaging instructions
+#
+# Author:      Robin Dunn
+#
+# RCS-ID:      $Id$
+# Copyright:   (c) 2004 by Total Control Software
+# Licence:     wxWindows license
+#----------------------------------------------------------------------
+
+
+# The following values can be set on the rpmbuild command line with
+# --define 'name VALUE'  If no value is set on the command line then
+# the default value set here will be used instead.
+
+
+# Which version of Python to build with.  Used to assemble python
+# binary name so use '2.2', '2.3', etc.
+%if %{?pyver:0}%{!?pyver:1}
+%define pyver 2.3
+%endif
+
+
+# Which wxWidgets port to build and use.  Current acceptable values
+# are 'gtk' and 'gtk2'.
+%if %{?port:0}%{!?port:1}
+%define port gtk2
+%endif
+
+
+# Build in unicode mode?  Can only be used if port is gtk2, acceptable
+# values are '0' and '1'
+%if %{?unicode:0}%{!?unicode:1}
+%define unicode 1
+%endif
 
 
 # Should the builtin image and etc. libs be used, or system libs?
 # Distro specific RPMs should probably set this to 0, generic ones
-# should use 1
-%define builtin_libs 1
+# should use 1.  
+# NOTE: I'm trying 0 for this next release to see if I can get rid of
+# this...
+%if %{?builtin_libs:0}%{!?builtin_libs:1}
+%define builtin_libs 0
+%endif
 
 
 # Should --enable-debug_flag be used in release builds?  Using it
 # defines __WXDEBUG__ and gives us runtime diagnostics that are turned
-# into Python exceptions starting with 2.3.4.  (So turning it on is a
-# very helpful thing IMO and is recommended.)
+# into Python exceptions.  (So turning it on is a very helpful thing
+# IMO and is recommended.)  The code is still compiled with
+# optimization flags and and without debug info and such when this
+# option is used, it simply turns on some extra code.
+%if %{?debug_flag:0}%{!?debug_flag:1}
 %define debug_flag 1
+%endif
+
+
+# Used to set the Release tag below.  I normally use it to define what
+# distro the RPM was build on and also include the version of Python
+# it was built with.  
+%if %{?release:0}%{!?release:1}
+%define release 1_py%{pyver}
+%endif
 
 
-# build the name of the real wx-config from the port, flags, etc.
-%define dbgflg %(if [ "%{debug_flag}" = "1" ]; then echo d; fi)
-%define uniflg %(if [ "%{unicode}" = "1" ]; then echo u; fi)
-%define DBGFLG %(if [ "%{debug_flag}" = "1" ]; then echo D; fi)
-%define UNIFLG %(if [ "%{unicode}" = "1" ]; then echo U; fi)
-%define wxconfigname %{wxpref}/bin/wx%{lcport}%{uniflg}%{dbgflg}-%{ver2}-config
 
-# turn off the generation of debuginfo rpm  (RH9)
+#----------------------------------------------------------------------
+# Other variables used below
+
+%define pref 	   %{_prefix}
+%define python 	   /usr/bin/python%{pyver}
+%define tarname    @TARNAME@
+%define version    @VERSION@
+%define ver2       @VER2@
+
+%define chartype   %(if [ "%{unicode}" = "1" ]; then echo unicode; else echo ansi; fi)
+%define gtktype    %(if [ "%{port}" = "gtk2" ]; then echo 2; fi)
+%define using_gtk1 %(if [ "%{port}" = "gtk" ]; then echo 1; else echo 0; fi)
+
+%define wxprefbase %{pref}/lib/wxPython
+%define wxpref     %{wxprefbase}-%{version}-%{port}-%{chartype}
+%define pkgname    wxPython
+
+# turn off the generation of debuginfo rpm  (RH9) ??
 %define debug_package %{nil}
 
-#----------------------------------------------------------------
-Summary:   Cross platform GUI toolkit for Python using wx%{port}
-Name:      %{name}
+
+#----------------------------------------------------------------------
+# Package definition
+#----------------------------------------------------------------------
+Name:      %{pkgname}%{ver2}
+Summary:   Cross platform GUI toolkit for Python
 Version:   %{version}
 Release:   %{release}
 Source0:   %{tarname}-%{version}.tar.gz
-License:   wxWindows Library Licence, Version 3
+License:   wx Library Licence, Version 3
 URL:       http://wxPython.org/
 Packager:  Robin Dunn <robin@alldunn.com>
 Group:     Development/Python
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{pkgname}-buildroot
 Prefix:    %{pref}
 
-Provides: wxPython  = %{version}
-Provides: wxPython%{port}  = %{version}
+%description 
+Cross platform GUI toolkit for Python
 
-# Provides: libwx_%{lcport}%{uniflg}%{dbgflg}-%{ver2}.so
-# Provides: libwx_%{lcport}%{uniflg}%{dbgflg}-%{ver2}.so(WX%{port}%{UNIFLG}%{DBGFLG}_%{ver2})
-# Provides: libwx_%{lcport}%{uniflg}%{dbgflg}_gl-%{ver2}.so
-# Provides: libwx_%{lcport}%{uniflg}%{dbgflg}_gl-%{ver2}.so(WX%{port}%{UNIFLG}%{DBGFLG}_%{ver2})
 
 
-# old wxPython packages
-Obsoletes: wxPython wxPython%{port}
 
+%package -n %{pkgname}%{ver2}-%{port}-%{chartype}
+Summary:   Cross platform GUI toolkit for Python
+Group:     Development/Python
+Requires:  %{pkgname}-common
+Obsoletes: wxPythonGTK%{gtktype}-py%{pyver}
+Provides:  wxPython
 
-%description
-wxPython is a GUI toolkit for Python that is a wrapper around the
-wxWindows C++ GUI library.  wxPython provides a large variety of
-window types and controls, all implemented with a native look and feel
-(and native runtime speed) on the platforms it is supported on.
 
-This package is implemented using the %{port} port of wxWindows, and
-includes the wx%{port} shared libs and etc.
+%description -n %{pkgname}%{ver2}-%{port}-%{chartype}
+wxPython is a GUI toolkit for the Python programming language. It
+ allows Python programmers to create programs with a robust, highly
+functional graphical user interface, simply and easily. It is
+implemented as a Python extension module (native code) that wraps the
+popular wxWidgets cross platform GUI library, which is written in C++.
 
+wxPython is a cross-platform toolkit. The same program will usually
+run on multiple platforms without modification. Currently supported
+platforms are 32-bit Microsoft Windows, most Unix or unix-like
+systems, and Macintosh OS X.
 
-%package -n wxPython%{port}-devel
-Summary: wxPython%{port} development files
-Group: Development/Libraries
-Requires: wxPython%{port} = %{version}
+This package contains the wxPython runtime files built for the
+wxWidgets %{port} port with %{chartype} character type.
+
+
+
+
+
+%package -n %{pkgname}-common-%{port}-%{chartype}
+Summary: Common files for needed by all wxPython runtimes
+Group: Development/Python
+Provides: %{pkgname}-common
 
+# They obsolete each other so any of them can be installed over another
+# without conflicts
+Obsoletes: %{pkgname}-common-gtk-ansi
+Obsoletes: %{pkgname}-common-gtk2-ansi
+Obsoletes: %{pkgname}-common-gtk2-unicode
 
-%description -n wxPython%{port}-devel
+%description -n %{pkgname}-common-%{port}-%{chartype}
+This package contains the common files needed by any version of the
+wxPython runtime.  This pacakge also installs a wx.pth file which will
+determine which of the installed runtimes is the default version of
+wxPython that is imported automatically with a bare "import wx".
+
+
+
+
+
+%package -n %{pkgname}%{ver2}-devel-%{port}-%{chartype}
+Summary: wxPython development files
+Group: Development/Libraries
+Requires: %{pkgname}%{ver2}-%{port}-%{chartype} = %{version}
+
+%description -n %{pkgname}%{ver2}-devel-%{port}-%{chartype}
 This packages contains the headers and etc. for building apps or
-Python extension modules that use the same wx%{port} shared libraries
+Python extension modules that use the same wxWidgets shared libraries
 that wxPython uses.
 
-#----------------------------------------------------------------
+
+
+#----------------------------------------------------------------------
 %prep
 %setup -q -n %{tarname}-%{version}
 
 
-#----------------------------------------------------------------
+#----------------------------------------------------------------------
 %build
 
 WXDIR=`pwd`
+
+# Configure and build wxWidgets
 mkdir bld
 cd bld
-
-# Configure, trying to reduce external dependencies
-../configure --with-%{lcport} \
+../configure --with-gtk \
 	--prefix=%{wxpref} \
-	--disable-soname \
-	--disable-monolithic \
+	--enable-monolithic \
 	--enable-rpath=%{wxpref}/lib \
 	--with-opengl \
-%if %{unicode}
+	--enable-geometry \
+	--enable-optimise \
+	--enable-sound 	--with-sdl \
+	--enable-display \
+%if %{using_gtk1}
+	--disable-gtk2 \
+%else 
 	--enable-gtk2 \
+%endif
+%if %{unicode}
 	--enable-unicode \
 %endif
-	--enable-geometry \
-	--enable-optimise \
 %if %{debug_flag}
 	--enable-debug_flag \
 %endif
@@ -119,86 +209,56 @@ cd bld
 %endif
 
 
-# Build wxWindows and some contrib libs
 make 
 make -C contrib/src/gizmos 
 make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
 make -C contrib/src/stc
-make -C contrib/src/xrc
-
 
-# Install wxWindows and the contribs so the wxPython build can find
-# all the headers it needs
-make prefix=$RPM_BUILD_ROOT%{wxpref} install
-make -C contrib/src/gizmos prefix=$RPM_BUILD_ROOT%{wxpref} install
-make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" prefix=$RPM_BUILD_ROOT%{wxpref} install
-make -C contrib/src/stc prefix=$RPM_BUILD_ROOT%{wxpref} install
-make -C contrib/src/xrc prefix=$RPM_BUILD_ROOT%{wxpref} install
 
 
-# Now build wxPython
+# Build wxPython
 cd $WXDIR/wxPython
 %{python} setup.py \
-	NO_SCRIPTS=1 \
-	WXPORT=%{lcport} \
+	WXPORT=%{port} \
 	UNICODE=%{unicode} \
-	WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
-	build
-
-## $WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" 
-
-# Build wxrc (XRC resource tool)
-cd $WXDIR/bld/contrib/utils/wxrc
-make
-strip wxrc
-
-
-# install wxPython
-cd $WXDIR/wxPython
-%{python} setup.py \
+	EP_ADD_OPTS=1 \
 	NO_SCRIPTS=1 \
-	WXPORT=%{lcport} \
-	UNICODE=%{unicode} \
-	WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
-	install \
-	--root=$RPM_BUILD_ROOT
+	WX_CONFIG="$WXDIR/bld/wx-config --inplace" \
+       	build
 
 
-#----------------------------------------------------------------
+
+#----------------------------------------------------------------------
 %install
-##[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 WXDIR=`pwd`
 
-# # install wxWindows
-# cd bld
-# make prefix=$RPM_BUILD_ROOT%{wxpref} install
-# make -C contrib/src/gizmos prefix=$RPM_BUILD_ROOT%{wxpref} install
-# make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" prefix=$RPM_BUILD_ROOT%{wxpref} install
-# make -C contrib/src/stc prefix=$RPM_BUILD_ROOT%{wxpref} install
-# make -C contrib/src/xrc prefix=$RPM_BUILD_ROOT%{wxpref} install
-
-# # install wxPython
-# cd $WXDIR/wxPython
-# %{python} setup.py \
-# 	NO_SCRIPTS=1 \
-# 	WXPORT=%{lcport} \
-# 	UNICODE=%{unicode} \
-# 	WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
-# 	install \
-# 	--root=$RPM_BUILD_ROOT
+# Install wxGTK and contribs
+cd bld
+make prefix=$RPM_BUILD_ROOT%{wxpref} install
+make -C contrib/src/gizmos prefix=$RPM_BUILD_ROOT%{wxpref} install
+make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" prefix=$RPM_BUILD_ROOT%{wxpref} install
+make -C contrib/src/stc prefix=$RPM_BUILD_ROOT%{wxpref} install
 
 
 
+# Install wxPython for wxGTK
+cd $WXDIR/wxPython
+%{python} setup.py \
+	WXPORT=%{port} \
+	UNICODE=%{unicode} \
+	EP_ADD_OPTS=1 \
+	NO_SCRIPTS=1 \
+	WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
+	install \
+	--root=$RPM_BUILD_ROOT
 
 
-# Other "install" tasks...
-cd $WXDIR/wxPython
+# remove the wx-config symlink, we'll redo it when installing the -devel package
+rm $RPM_BUILD_ROOT%{wxpref}/bin/wx-config
 
-# install the wxPython headers
-cp -R include $RPM_BUILD_ROOT%{wxpref}
-mkdir -p $RPM_BUILD_ROOT%{wxpref}/include/wx/wxPython/i_files
-cp src/*.i $RPM_BUILD_ROOT%{wxpref}/include/wx/wxPython/i_files
+# make sure that debug info is stripped
+strip $RPM_BUILD_ROOT%{pref}/lib*/python%{pyver}/site-packages/wx-%{ver2}*-%{port}-%{chartype}/wx/*.so
 
 
 # Since I want this RPM to be as generic as possible I won't let
@@ -206,10 +266,8 @@ cp src/*.i $RPM_BUILD_ROOT%{wxpref}/include/wx/wxPython/i_files
 # the #! line to use the real python pathname.  Since some distros
 # install python 2.2 as python2 and others as python I can't let
 # distutils do that otherwise the dependencies will be fouled up.
-# Copy them manually instead, leaving the #!/bin/env line intact. 
-# TODO: Should this be dependent on %{builtin_libs} or something like
-# it?
-
+# Copy them manually instead, leaving the #!/usr/bin/env line intact. 
+cd $WXDIR/wxPython
 mkdir -p $RPM_BUILD_ROOT%{pref}/bin
 for s in \
 	helpviewer \
@@ -221,122 +279,141 @@ for s in \
 	pycrust \
 	pywrap \
 	pyshell \
+	pywxrc \
 	xrced; do
     cp scripts/$s $RPM_BUILD_ROOT%{pref}/bin
 done
 
 
-# Install wxrc
-cp $WXDIR/bld/contrib/utils/wxrc/wxrc $RPM_BUILD_ROOT%{pref}/bin
-
-
-# link specific name to generic name
-ln -s wxPython-%{version} $RPM_BUILD_ROOT%{wxprefbase}
-
-
-
-
-# Copy icons and make menu entries
-#-- This only works for Mandrake.  Is there a cross-distro way to do it?
-##mkdir -p $RPM_BUILD_ROOT%{_iconsdir}
-##mkdir -p $RPM_BUILD_ROOT%{_miconsdir}
-##mkdir -p $RPM_BUILD_ROOT%{_menudir}
-##install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_32.png $RPM_BUILD_ROOT%{_iconsdir}/PyCrust.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_16.png $RPM_BUILD_ROOT%{_miconsdir}/PyCrust.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_iconsdir}/XRCed.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT%{_miconsdir}/XRCed.png
-##
-##cat > $RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
-##?package(%{name}): command="%_bindir/pyshell" needs="X11" \
-##icon="PyCrust.png" section="Applications/Development" \
-##title="PyShell" longtitle="Python Shell"
-##
-##?package(%{name}): command="%_bindir/pycrust" needs="X11" \
-##icon="PyCrust.png" section="Applications/Development" \
-##title="PyCrust" longtitle="Python Shell with Filling"
-##
-##?package(%{name}): command="%_bindir/pyalamode" needs="X11" \
-##icon="PyCrust.png" section="Applications/Development" \
-##title="PyAlaMode" longtitle="Python Shell with Filling and editor windows"
-##
-##?package(%{name}): command="%_bindir/xrced" needs="X11" \
-##icon="XRCed.png" section="Applications/Development" \
-##title="XRCed" longtitle="wxPython XRC resource editor"
-##
-##EOF
-
-
-
-# Generate the filelists.  For some reason the %defattr below is still
-# resulting in many (but not all) files not owned by root when just
-# specifying directories and wildcards to be included in each package.
-# So instead we'll build some explicit filelists here and use %attr on
-# each entry.
-cd $WXDIR
-# mkdir -p $RPM_BUILD_ROOT%{pref}/share/doc
-# GFL="%{python} wxPython/distrib/genfilelist.py"
-# $GFL    $RPM_BUILD_ROOT %{pref}                     > FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{pref}/bin                >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{pref}/lib                >> FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{pref}/lib/python%{pyver} >> FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{pref}/share              >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{wxpref}                  >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{wxprefbase}              >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{wxpref}/lib              >> FILELIST
-# $GFL    $RPM_BUILD_ROOT "%{wxpref}/lib/libwx*"     >> FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{wxpref}/share            >> FILELIST
-# ###GFL -r $RPM_BUILD_ROOT %{_iconsdir}               >> FILELIST
-# ##$GFL -r $RPM_BUILD_ROOT %{_menudir}                >> FILELIST
-
-# $GFL    $RPM_BUILD_ROOT %{wxpref}/include           > DEVELLIST
-# $GFL -r $RPM_BUILD_ROOT %{wxpref}/include/wx       >> DEVELLIST
-# $GFL -r $RPM_BUILD_ROOT %{wxpref}/lib/wx           >> DEVELLIST
-# $GFL    $RPM_BUILD_ROOT %{wxconfigname}            >> DEVELLIST
-# $GFL    $RPM_BUILD_ROOT %{wxpref}/bin/wx-config    >> DEVELLIST
-
-
-#----------------------------------------------------------------
-##%post
-##%{update_menus}
-##
-##%postun
-##%{clean_menus}
-
-
-%pre
-if [ -e %{wxprefbase} ]; then
-	rm -r %{wxprefbase}
+
+# install KDE & GNOME menu items
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Development
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+for d in distrib/*.desktop; do
+	install -m 644 $d $RPM_BUILD_ROOT%{_datadir}/applnk/Development
+	install -m 644 $d $RPM_BUILD_ROOT%{_datadir}/applications
+done
+
+# install KDE icons
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32}/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -m 644 wx/py/PyCrust_16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/PyCrust.png
+install -m 644 wx/py/PyCrust_32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/PyCrust.png
+install -m 644 wx/py/PyCrust_32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/PyCrust.png
+install -m 644 wx/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/XRCed.png
+install -m 644 wx/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/XRCed.png
+install -m 644 wx/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/XRCed.png
+
+# install Mandrake menu items
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/menu
+cat > $RPM_BUILD_ROOT%{_libdir}/menu/%{pkgname} <<EOF
+?package(%{pkgname}): \\
+	command="%{_bindir}/pyshell" \\
+	needs="X11" \\
+	icon="PyCrust.png" \\
+	section="Applications/Development/Tools" \\
+	title="PyShell" \\
+	longtitle="GUI Python Shell"
+?package(%{pkgname}): \\
+	command="%{_bindir}/pycrust" \\
+	needs="X11" \\
+	icon="PyCrust.png" \\
+	section="Applications/Development/Tools" \\
+	title="PyCrust" \\
+	longtitle="GUI Python Shell with Filling"
+?package(%{pkgname}): \\
+	command="%{_bindir}/pyalamode" \\
+	needs="X11" \\
+	icon="PyCrust.png" \\
+	section="Applications/Development/Tools" \\
+	title="PyAlaMode" \\
+	longtitle="GUI Python Shell with Filling and editor windows"
+?package(%{pkgname}): \\
+	command="%{_bindir}/xrced" \\
+	needs="X11" \\
+	icon="XRCed.png" \\
+	section="Applications/Development/Tools" \\
+	title="XRCed" \\
+	longtitle="wxPython XRC resource editor"
+EOF
+
+
+#----------------------------------------------------------------------
+
+%post -n %{pkgname}%{ver2}-%{port}-%{chartype}
+if [ ! -e %{wxprefbase} ]; then
+	ln -s %{pkgname}-%{version}-%{port}-%{chartype}  %{wxprefbase}
 fi
 
-%postun
-if [ -e %{wxprefbase} ]; then
-	rm %{wxprefbase}
+%preun -n %{pkgname}%{ver2}-%{port}-%{chartype}
+if [ -L %{wxprefbase} ]; then
+	if [ `readlink %{wxprefbase}` == %{pkgname}-%{version}-%{port}-%{chartype} ]; then
+		rm -f %{wxprefbase}
+	fi
 fi
 
-#----------------------------------------------------------------
-#%clean
-#[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
-#----------------------------------------------------------------
 
-%files
+%post -n %{pkgname}-common-%{port}-%{chartype}
+# This is done on Mandrake to update its menus:
+if [ -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
+
+%postun -n %{pkgname}-common-%{port}-%{chartype}
+# This is done on Mandrake to update its menus:
+if [ "$1" = "0" -a -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
+
+
+
+%post -n %{pkgname}%{ver2}-devel-%{port}-%{chartype}
+cd %{wxpref}/bin
+ln -s ../lib/wx/config/%{port}-%{chartype}*  wx-config 
+
+%preun -n %{pkgname}%{ver2}-devel-%{port}-%{chartype}
+rm %{wxpref}/bin/wx-config
+
+
+#----------------------------------------------------------------------
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+
+#----------------------------------------------------------------------
+
+%files -n %{pkgname}%{ver2}-%{port}-%{chartype}
 %defattr(-,root,root)
 %doc docs/preamble.txt docs/licence.txt docs/lgpl.txt docs/readme.txt docs/changes.txt
 %doc wxPython/docs/*
-%{_bindir}/*
-%{_libdir}/python%{pyver}/site-packages/*
-%{wxpref}/lib/libwx*
+%dir %{pref}/lib*/python%{pyver}/site-packages/wx-%{ver2}*-%{port}-%{chartype}
+%{pref}/lib*/python%{pyver}/site-packages/wx-%{ver2}*-%{port}-%{chartype}/*
+%dir %{wxpref}
+%dir %{wxpref}/lib
+%{wxpref}/lib/libwx_gtk*
 %{wxpref}/share
-%{wxprefbase}
 
 
-%files -n wxPython%{port}-devel
+
+%files -n %{pkgname}-common-%{port}-%{chartype}
+%defattr(-,root,root)
+%{pref}/lib*/python%{pyver}/site-packages/wxversion.*
+%{pref}/lib*/python%{pyver}/site-packages/wx.pth
+%{_bindir}/*
+%{_datadir}/applnk/Development/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/pixmaps/*
+%{_libdir}/menu/*
+
+
+
+
+
+%files -n %{pkgname}%{ver2}-devel-%{port}-%{chartype}
 %defattr(-,root,root)
 %{wxpref}/include
 %{wxpref}/lib/wx
-%{wxconfigname}
-%{wxpref}/bin/wx-config
+%dir %{wxpref}/bin
+
 
-#----------------------------------------------------------------
+#----------------------------------------------------------------------
 # end of file