another merge from WX_2_6_BRANCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -58,13 +58,30 @@
|
||||
|
||||
|
||||
# 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
|
||||
# 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
|
||||
|
||||
|
||||
# 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 0
|
||||
%endif
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Other variables used below
|
||||
@@ -195,6 +212,9 @@ cd bld
|
||||
--enable-geometry \
|
||||
--enable-optimise \
|
||||
--enable-sound --with-sdl \
|
||||
%if %{mediactrl}
|
||||
--enable-mediactrl \
|
||||
%endif
|
||||
--enable-display \
|
||||
%if %{unicode}
|
||||
--enable-unicode \
|
||||
@@ -226,6 +246,7 @@ cd $WXDIR/wxPython
|
||||
WXPORT=%{port} \
|
||||
UNICODE=%{unicode} \
|
||||
EP_ADD_OPTS=1 \
|
||||
EP_FULL_VER=%{fullver} \
|
||||
NO_SCRIPTS=1 \
|
||||
WX_CONFIG="$WXDIR/bld/wx-config --no_rpath" \
|
||||
build_ext --rpath=%{wxpref}/lib \
|
||||
@@ -253,6 +274,7 @@ cd $WXDIR/wxPython
|
||||
WXPORT=%{port} \
|
||||
UNICODE=%{unicode} \
|
||||
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 \
|
||||
|
Reference in New Issue
Block a user