Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RPM tweaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-01-18 00:13:51 +00:00
parent 548d77c789
commit 978cadd05f
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/distrib/makerpm
View File

@@ -49,7 +49,7 @@ function usage {
# echo " smp Add SMP=2 to the envivonment to speed wxGTK build" # echo " smp Add SMP=2 to the envivonment to speed wxGTK build"
} }
if [ $# -lt 2 ]; then if [ $# -lt 1 ]; then
usage usage
exit 1 exit 1
fi fi

39
wxPython/distrib/wxPythonFull.spec.in
View File

@@ -127,13 +127,12 @@ make -C contrib/src/stc
make -C contrib/src/xrc make -C contrib/src/xrc
# Install wxWindows and the contribs so the wxPython build can find # Link the contrib header directories in place so we can build all of
# all the headers it needs # wxPython without installing wxWindows
make prefix=$RPM_BUILD_ROOT%{wxpref} install if [ ! -e $WXDIR/include/wx/gizmos ]; then
make -C contrib/src/gizmos prefix=$RPM_BUILD_ROOT%{wxpref} install cd $WXDIR/include/wx
make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" prefix=$RPM_BUILD_ROOT%{wxpref} install ln -s ../../contrib/include/wx/* .
make -C contrib/src/stc prefix=$RPM_BUILD_ROOT%{wxpref} install fi
make -C contrib/src/xrc prefix=$RPM_BUILD_ROOT%{wxpref} install
# Now build wxPython # Now build wxPython
@@ -142,10 +141,9 @@ cd $WXDIR/wxPython
NO_SCRIPTS=1 \ NO_SCRIPTS=1 \
WXPORT=%{lcport} \ WXPORT=%{lcport} \
UNICODE=%{unicode} \ 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 build
## $WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld"
# Build wxrc (XRC resource tool) # Build wxrc (XRC resource tool)
cd $WXDIR/bld/contrib/utils/wxrc cd $WXDIR/bld/contrib/utils/wxrc
@@ -153,6 +151,21 @@ make
strip wxrc 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 # install wxPython
cd $WXDIR/wxPython cd $WXDIR/wxPython
%{python} setup.py \ %{python} setup.py \
@@ -164,11 +177,7 @@ cd $WXDIR/wxPython
--root=$RPM_BUILD_ROOT --root=$RPM_BUILD_ROOT
#----------------------------------------------------------------
%install
# Other "install" tasks...
WXDIR=`pwd`
cd $WXDIR/wxPython cd $WXDIR/wxPython
# install the wxPython headers # install the wxPython headers
@@ -206,10 +215,6 @@ done
cp $WXDIR/bld/contrib/utils/wxrc/wxrc $RPM_BUILD_ROOT%{pref}/bin 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 # install KDE & GNOME menus
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Development mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Development
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications