X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7093495299832111b5841485c94307ffedbaec90..ee45c548e61fa0ce1f8adbcf29d7678769f2c0ed:/wxPython/distrib/wxPythonFull.spec.in diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in index e81db5091c..898695b763 100644 --- a/wxPython/distrib/wxPythonFull.spec.in +++ b/wxPython/distrib/wxPythonFull.spec.in @@ -15,15 +15,14 @@ # the default value set here will be used instead. -# 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} +# 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 valuse +# Which wxWidgets port to build and use. Current acceptable values # are 'gtk' and 'gtk2'. %if %{?port:0}%{!?port:1} %define port gtk2 @@ -36,14 +35,6 @@ %define unicode 1 %endif -# 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 - - - # Should the builtin image and etc. libs be used, or system libs? # Distro specific RPMs should probably set this to 0, generic ones @@ -66,6 +57,15 @@ %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 + + + #---------------------------------------------------------------------- # Other variables used below @@ -112,7 +112,7 @@ Cross platform GUI toolkit for Python Summary: Cross platform GUI toolkit for Python Group: Development/Python Requires: %{pkgname}-common -Obsoletes: wxPythonGTK%{gtktype}-py%{pyver} +Obsoletes: wxPythonGTK%{gtktype}-py%{pyver}, wxPythonGTK%{gtktype} Provides: wxPython @@ -181,26 +181,30 @@ WXDIR=`pwd` # Configure and build wxWidgets mkdir bld cd bld -../configure --with-gtk \ +../configure \ +%if %{using_gtk1} + --with-gtk=1 \ +%else + --with-gtk=2 \ +%endif --prefix=%{wxpref} \ --enable-monolithic \ - --enable-rpath=%{wxpref}/lib \ + --disable-rpath \ --with-opengl \ + --with-gnomeprint \ --enable-geometry \ --enable-optimise \ --enable-sound --with-sdl \ --enable-display \ -%if %{using_gtk1} - --disable-gtk2 \ -%else - --enable-gtk2 \ -%endif %if %{unicode} --enable-unicode \ +%else + --disable-unicode \ %endif %if %{debug_flag} --enable-debug_flag \ %endif + --disable-debugreport \ %if %{builtin_libs} --with-libjpeg=builtin \ --with-libpng=builtin \ @@ -210,8 +214,8 @@ cd bld make +make -C contrib/src/animate make -C contrib/src/gizmos -make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" make -C contrib/src/stc @@ -223,8 +227,9 @@ cd $WXDIR/wxPython UNICODE=%{unicode} \ EP_ADD_OPTS=1 \ NO_SCRIPTS=1 \ - WX_CONFIG="$WXDIR/bld/wx-config --inplace" \ - build + WX_CONFIG="$WXDIR/bld/wx-config --no_rpath" \ + build_ext --rpath=%{wxpref}/lib \ + build @@ -236,8 +241,8 @@ WXDIR=`pwd` # Install wxGTK and contribs cd bld make prefix=$RPM_BUILD_ROOT%{wxpref} install +make -C contrib/src/animate 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 @@ -249,7 +254,8 @@ cd $WXDIR/wxPython UNICODE=%{unicode} \ EP_ADD_OPTS=1 \ NO_SCRIPTS=1 \ - WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \ + 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