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

Some distrib tweaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-03-12 19:59:50 +00:00
parent dc4b282d2f
commit 6e83b721d9
2 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wxPython/distrib/makerpm
View File

@@ -152,17 +152,12 @@ if [ -z "${skipcopy}" ]; then
done
# now do the same thing for wxPython, skipping it's build dirs and such
mkdir ${tarver}/wxPython
cp -pf --link ${wxdir}/wxPython/* ${tarver}/wxPython > /dev/null 2>&1
for d in contrib demo distrib distutils docs include licence samples scripts src SWIG wx wxPython; do
cp -Rpf --link ${wxdir}/wxPython/$d ${tarver}/wxPython #> /dev/null 2>&1
for dir in `grep -v '#' ${wxdir}/wxPython/distrib/DIRLIST`; do
mkdir ${tarver}/${dir}
##echo "cp -pf --link ${wxdir}/${dir}/* ${tarver}/${dir}"
cp -pf --link ${wxdir}/${dir}/* ${tarver}/${dir} > /dev/null 2>&1
done
# cp -Rpf --link ${wxdir}/* ${tarver} > /dev/null 2>&1
# rm -r ${tarver}/bld*
# rm -r ${tarver}/wxPython/build*
# rm -r ${tarver}/wxPython/_build_rpm
echo "*** Removing uneeded stuff from copy of CVS tree"
pushd ${tarver} > /dev/null
cleanup .cvsignore
@@ -184,8 +179,6 @@ if [ -z "${skipcopy}" ]; then
cleanup "core.[0-9]*"
rm -f wxPython/wx/* > /dev/null 2>&1
rm wxPython/demo/.setup.sh
rm -r wxPython/docs/xml-raw
popd > /dev/null
popd > /dev/null

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

@@ -42,7 +42,7 @@ Name: %{name}
Version: %{version}
Release: %{release}
Source0: %{tarname}-%{version}.tar.gz
License: wxWindows Library Licence, Version 3
License: wx Library Licence, Version 3
URL: http://wxPython.org/
Packager: Robin Dunn <robin@alldunn.com>
Group: Development/Python
@@ -64,11 +64,11 @@ Obsoletes: wxPython wxPython%{port}
%description
wxPython is a GUI toolkit for Python that is a wrapper around the
wxWindows C++ GUI library. wxPython provides a large variety of
wxWidgets C++ GUI library. wxPython provides a large variety of
window types and controls, all implemented with a native look and feel
(and native runtime speed) on the platforms it is supported on.
This package is implemented using the %{port} port of wxWindows, and
This package is implemented using the %{port} port of wxWidgets, and
includes the wx%{port} shared libs and etc.
@@ -121,7 +121,7 @@ cd bld
%endif
# Build wxWindows and some contrib libs
# Build wxWidgets and some contrib libs
make
make -C contrib/src/gizmos
make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
@@ -129,14 +129,6 @@ make -C contrib/src/stc
make -C contrib/src/xrc
# # 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
cd $WXDIR/wxPython
%{python} setup.py \
@@ -144,7 +136,7 @@ cd $WXDIR/wxPython
WXPORT=%{lcport} \
UNICODE=%{unicode} \
WX_CONFIG="$WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" \
CONTRIBS_INC="$WXDIR/include" \
CONTRIBS_INC="$WXDIR/contrib/include" \
build
@@ -160,8 +152,7 @@ strip wxrc
WXDIR=`pwd`
cd bld
# Install wxWindows and the contribs so the wxPython build can find
# all the headers it needs
# Install wxWidgets and the contribs
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
@@ -180,7 +171,6 @@ cd $WXDIR/wxPython
--root=$RPM_BUILD_ROOT
cd $WXDIR/wxPython
# install the wxPython headers