From 978cadd05ffaab12783b69ea12033947e009ec3c Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sun, 18 Jan 2004 00:13:51 +0000
Subject: [PATCH] RPM tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
wxPython/distrib/makerpm | 2 +-
wxPython/distrib/wxPythonFull.spec.in | 39 +++++++++++++++------------
2 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index d4df0c35c5..3bc3a4d755 100755
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -49,7 +49,7 @@ function usage {
# echo " smp Add SMP=2 to the envivonment to speed wxGTK build"
}
-if [ $# -lt 2 ]; then
+if [ $# -lt 1 ]; then
usage
exit 1
fi
diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index fe282b967a..f36dd6e81e 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
--
2.47.2