X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc59c2062c644236551b9652874414bdb2144955..77c7f5c930b6336834f97c47f5e550c9354c11ea:/wxPython/distrib/wxPythonFull.spec.in?ds=inline

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index fe282b967a..ef201326ef 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -127,13 +127,12 @@ 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
+# 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
@@ -142,10 +141,9 @@ cd $WXDIR/wxPython
 	NO_SCRIPTS=1 \
 	WXPORT=%{lcport} \
 	UNICODE=%{unicode} \
-	WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
+	WX_CONFIG="$WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" \
 	build
 
-## $WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" 
 
 # Build wxrc (XRC resource tool)
 cd $WXDIR/bld/contrib/utils/wxrc
@@ -153,6 +151,21 @@ make
 strip wxrc
 
 
+#----------------------------------------------------------------
+%install
+
+WXDIR=`pwd`
+cd bld
+
+# 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
+
+
 # install wxPython
 cd $WXDIR/wxPython
 %{python} setup.py \
@@ -164,11 +177,7 @@ cd $WXDIR/wxPython
 	--root=$RPM_BUILD_ROOT
 
 
-#----------------------------------------------------------------
-%install
 
-# Other "install" tasks...
-WXDIR=`pwd`
 cd $WXDIR/wxPython
 
 # install the wxPython headers
@@ -206,10 +215,6 @@ done
 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}
-
-
 # install KDE & GNOME menus
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Development
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -280,9 +285,7 @@ if [ -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
 
 
 %postun
-if [ -e %{wxprefbase} ]; then
-	rm %{wxprefbase}
-fi
+rm -f %{wxprefbase}
 # 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
 
@@ -300,6 +303,8 @@ if [ "$1" = "0" -a -x /usr/bin/update-menus ]; then /usr/bin/update-menus || tru
 %doc wxPython/docs/*
 %{_bindir}/*
 %{_libdir}/python%{pyver}/site-packages/*
+%dir %{wxpref}
+%dir %{wxpref}/lib
 %{wxpref}/lib/libwx*
 %{wxpref}/share
 %{_datadir}/applnk/Development/*