moved vararg CRT functions wrappers to a new wxcrtvararg.h header

[wxWidgets.git] / wxPython / distrib / wxPythonFull.spec.in

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index a64c7ac5408e14cf0412253f0a0bac8c8b79aeb9..8d86737c7a8051c00738ce9891d4af8d390fec7d 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -1,118 +1,231 @@
-%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.3', '2.4', etc.
+%if %{?pyver:0}%{!?pyver:1}
+%define pyver 2.4
+%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 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
 
 
 # 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
 %define debug_flag 1

+%endif
+
+
+# Used to set the Release tag below.  I normally use it to define what
+# distro the RPM was built on and also include the version of Python
+# it was built with.  
+%if %{?release:0}%{!?release:1}
+%define release 1_py%{pyver}
+%endif
+
+
+# This one is used to control whether the full 4 components of the
+# verseion number are used in the site-packages subdirectory name.  By
+# default only 2 or 3 components (depending on stable/unstable status)
+# are used.
+%if %{?fullver:0}%{!?fullver:1}
+%define fullver 0
+%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
+# Whether to add --enable-mediactrl to the wxWidgets configure.  For
+# some older versions of gstreamer-0.8 it currently incorerctly allows
+# its use eventhough there is a compatibility problem that causes a
+# failed compile.
+%if %{?mediactrl:0}%{!?mediactrl:1}
+%define mediactrl 1
+%endif

 
 

-# 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}
 
 %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}
 Version:   %{version}
 Release:   %{release}

-Source0:   %{tarname}-%{version}.tar.gz
-License:   wxWindows Library Licence, Version 3
+Source0:   %{tarname}-%{version}.tar.bz2
+License:   wx Library Licence, Version 3

 URL:       http://wxPython.org/
 Packager:  Robin Dunn <robin@alldunn.com>
 Group:     Development/Python
 URL:       http://wxPython.org/
 Packager:  Robin Dunn <robin@alldunn.com>
 Group:     Development/Python

-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{pkgname}-buildroot

 Prefix:    %{pref}
 
 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}, wxPythonGTK%{gtktype}
+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.
+%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++.

 
 

-This package is implemented using the %{port} port of wxWindows, and
-includes the wx%{port} shared libs and etc.
+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.

 
 

+This package contains the wxPython runtime files built for the
+wxWidgets %{port} port with %{chartype} character type.

 
 

-%package -n wxPython%{port}-devel
-Summary: wxPython%{port} development files
-Group: Development/Libraries
-Requires: wxPython%{port} = %{version}

 
 
 
 

-%description -n wxPython%{port}-devel
+
+
+%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 %{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
 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.
 
 that wxPython uses.
 

-#----------------------------------------------------------------
+
+
+#----------------------------------------------------------------------

 %prep
 %setup -q -n %{tarname}-%{version}
 
 
 %prep
 %setup -q -n %{tarname}-%{version}
 
 

-#----------------------------------------------------------------
+#----------------------------------------------------------------------

 %build
 
 WXDIR=`pwd`
 %build
 
 WXDIR=`pwd`

+
+# Configure and build wxWidgets

 mkdir bld
 cd bld
 mkdir bld
 cd bld

-
-# Configure, trying to reduce external dependencies
-../configure --with-%{lcport} \
+../configure \
+%if %{using_gtk1}
+       --with-gtk=1 \
+%else 
+       --with-gtk=2 \
+%endif

        --prefix=%{wxpref} \
        --prefix=%{wxpref} \

-       --disable-soname \

        --disable-monolithic \
        --disable-monolithic \

-       --enable-rpath=%{wxpref}/lib \
+       --disable-rpath \

        --with-opengl \
        --with-opengl \

-%if %{unicode}
-       --enable-gtk2 \
-       --enable-unicode \
-%endif
+       --with-gnomeprint \

        --enable-geometry \
        --enable-geometry \

+       --enable-graphics_ctx \

        --enable-optimise \
        --enable-sound  --with-sdl \
        --enable-optimise \
        --enable-sound  --with-sdl \

+%if %{mediactrl}
+       --enable-mediactrl \
+%endif

        --enable-display \
        --enable-display \

+%if %{unicode}
+       --enable-unicode \
+%else
+       --disable-unicode \
+%endif

 %if %{debug_flag}
        --enable-debug_flag \
 %endif
 %if %{debug_flag}
        --enable-debug_flag \
 %endif

+       --disable-debugreport \

 %if %{builtin_libs}
        --with-libjpeg=builtin \
        --with-libpng=builtin \
 %if %{builtin_libs}
        --with-libjpeg=builtin \
        --with-libpng=builtin \


@@ -121,72 +234,58 @@ cd bld
 %endif
 
 
 %endif
 
 

-# Build wxWindows and some contrib libs

 make 
 make -C contrib/src/gizmos 
 make 
 make -C contrib/src/gizmos 

-make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"

 make -C contrib/src/stc
 make -C contrib/src/stc

-make -C contrib/src/xrc
-

 
 

-# # Link the contrib header directories in place so we can build all of
-# # wxPython without installing wxWindows
-# if [ ! -e $WXDIR/include/wx/gizmos ]; then
-#      cd $WXDIR/include/wx
-#      ln -s ../../contrib/include/wx/* .
-# fi

 
 
 
 

-# Now build wxPython
+# Build wxPython

 cd $WXDIR/wxPython
 %{python} setup.py \
 cd $WXDIR/wxPython
 %{python} setup.py \

-       NO_SCRIPTS=1 \
-       WXPORT=%{lcport} \
+       WXPORT=%{port} \

        UNICODE=%{unicode} \
        UNICODE=%{unicode} \

-       WX_CONFIG="$WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" \
-       CONTRIBS_INC="$WXDIR/include" \
+       EP_ADD_OPTS=1 \
+       EP_FULL_VER=%{fullver} \
+       NO_SCRIPTS=1 \
+       WX_CONFIG="$WXDIR/bld/wx-config --no_rpath" \
+               build_ext --rpath=%{wxpref}/lib \

        build
 
 
        build
 
 

-# Build wxrc (XRC resource tool)
-cd $WXDIR/bld/contrib/utils/wxrc
-make
-strip wxrc
-

 
 

-#----------------------------------------------------------------
+#----------------------------------------------------------------------

 %install
 
 WXDIR=`pwd`
 %install
 
 WXDIR=`pwd`

-cd bld

 
 

-# Install wxWindows and the contribs so the wxPython build can find
-# all the headers it needs
+# 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 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/stc prefix=$RPM_BUILD_ROOT%{wxpref} install

-make -C contrib/src/xrc prefix=$RPM_BUILD_ROOT%{wxpref} install

 
 
 
 

-# install wxPython
+
+# Install wxPython for wxGTK

 cd $WXDIR/wxPython
 %{python} setup.py \
 cd $WXDIR/wxPython
 %{python} setup.py \

-       NO_SCRIPTS=1 \
-       WXPORT=%{lcport} \
+       WXPORT=%{port} \

        UNICODE=%{unicode} \
        UNICODE=%{unicode} \

-       WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
+       EP_ADD_OPTS=1 \
+       EP_FULL_VER=%{fullver} \
+       NO_SCRIPTS=1 \
+       WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref} --no_rpath" \
+               build_ext --rpath=%{wxpref}/lib \

        install \
        --root=$RPM_BUILD_ROOT
 
 
        install \
        --root=$RPM_BUILD_ROOT
 
 

+# remove the wx-config symlink, we'll redo it when installing the -devel package
+rm $RPM_BUILD_ROOT%{wxpref}/bin/wx-config

 
 

-cd $WXDIR/wxPython
-
-# 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
 
 
 # Since I want this RPM to be as generic as possible I won't let


@@ -194,10 +293,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.
 # 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 \
 mkdir -p $RPM_BUILD_ROOT%{pref}/bin
 for s in \
        helpviewer \


@@ -209,16 +306,14 @@ for s in \
        pycrust \
        pywrap \
        pyshell \
        pycrust \
        pywrap \
        pyshell \

+       pywxrc \

        xrced; do
     cp scripts/$s $RPM_BUILD_ROOT%{pref}/bin
 done
 
 
        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
-

 
 

-# install KDE & GNOME menus
+# 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
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Development
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 for d in distrib/*.desktop; do


@@ -236,31 +331,31 @@ install -m 644 wx/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT%{_datadir}/icons/hico
 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 -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
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/menu
-cat > $RPM_BUILD_ROOT%{_libdir}/menu/%{name} <<EOF
-?package(%{name}): \\
+# 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"
        command="%{_bindir}/pyshell" \\
        needs="X11" \\
        icon="PyCrust.png" \\
        section="Applications/Development/Tools" \\
        title="PyShell" \\
        longtitle="GUI Python Shell"

-?package(%{name}): \\
+?package(%{pkgname}): \\

        command="%{_bindir}/pycrust" \\
        needs="X11" \\
        icon="PyCrust.png" \\
        section="Applications/Development/Tools" \\
        title="PyCrust" \\
        longtitle="GUI Python Shell with Filling"
        command="%{_bindir}/pycrust" \\
        needs="X11" \\
        icon="PyCrust.png" \\
        section="Applications/Development/Tools" \\
        title="PyCrust" \\
        longtitle="GUI Python Shell with Filling"

-?package(%{name}): \\
+?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"
        command="%{_bindir}/pyalamode" \\
        needs="X11" \\
        icon="PyCrust.png" \\
        section="Applications/Development/Tools" \\
        title="PyAlaMode" \\
        longtitle="GUI Python Shell with Filling and editor windows"

-?package(%{name}): \\
+?package(%{pkgname}): \\

        command="%{_bindir}/xrced" \\
        needs="X11" \\
        icon="XRCed.png" \\
        command="%{_bindir}/xrced" \\
        needs="X11" \\
        icon="XRCed.png" \\


@@ -270,61 +365,86 @@ cat > $RPM_BUILD_ROOT%{_libdir}/menu/%{name} <<EOF
 EOF
 
 
 EOF
 
 

-#----------------------------------------------------------------
+#----------------------------------------------------------------------

 
 

-%pre
-if [ -e %{wxprefbase} ]; then
-       # in case there are old dirs from an old install
-       rm -r %{wxprefbase}
+%post -n %{pkgname}%{ver2}-%{port}-%{chartype}
+if [ ! -e %{wxprefbase} ]; then
+       ln -s %{pkgname}-%{version}-%{port}-%{chartype}  %{wxprefbase}

 fi
 
 fi
 

-
-%post
-if [ ! -e %{wxprefbase} ]; then
-       ln -s wxPython-%{version}  %{wxprefbase}
+%preun -n %{pkgname}%{ver2}-%{port}-%{chartype}
+if [ -L %{wxprefbase} ]; then
+       if [ `readlink %{wxprefbase}` == %{pkgname}-%{version}-%{port}-%{chartype} ]; then
+               rm -f %{wxprefbase}
+       fi

 fi
 fi

+
+
+
+
+%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
 
 # This is done on Mandrake to update its menus:
 if [ -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
 

-
-%postun
-rm -f %{wxprefbase}
+%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
 
 
 # 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
 
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 

-#----------------------------------------------------------------
+#----------------------------------------------------------------------

 
 

-%files
+%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/*
 %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/*
+%dir %{pref}/lib*/python%{pyver}/site-packages/wx-%{ver2}*-%{port}-%{chartype}
+%{pref}/lib*/python%{pyver}/site-packages/wx-%{ver2}*-%{port}-%{chartype}/*
+%dir %{pref}/lib*/python%{pyver}/site-packages/wxaddons
+%{pref}/lib*/python%{pyver}/site-packages/wxaddons/*

 %dir %{wxpref}
 %dir %{wxpref}/lib
 %dir %{wxpref}
 %dir %{wxpref}/lib

-%{wxpref}/lib/libwx*
+%{wxpref}/lib/libwx_*
+%dir %{wxpref}/bin
+%{wxpref}/bin/wxrc*

 %{wxpref}/share
 %{wxpref}/share

+
+
+
+%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/*
 
 %{_datadir}/applnk/Development/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/pixmaps/*
 %{_libdir}/menu/*
 

-##%{wxprefbase}

 
 
 
 

-%files -n wxPython%{port}-devel
+
+
+%files -n %{pkgname}%{ver2}-devel-%{port}-%{chartype}

 %defattr(-,root,root)
 %{wxpref}/include
 %{wxpref}/lib/wx
 %defattr(-,root,root)
 %{wxpref}/include
 %{wxpref}/lib/wx

-%{wxconfigname}
-%{wxpref}/bin/wx-config
+%dir %{wxpref}/bin
+

 
 

-#----------------------------------------------------------------
+#----------------------------------------------------------------------

 # end of file
 # end of file