X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59455c67d444c12f6d6a59e0c16528554c8b4c30..05e4fd64c4c7141f1a028020584755bad7291d02:/wxPython/distrib/wxPythonFull.spec.in?ds=sidebyside

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 32ab340a9e..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,35 +177,7 @@ cd $WXDIR/wxPython
 	--root=$RPM_BUILD_ROOT
 
 
-#----------------------------------------------------------------
-%install
-##[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-WXDIR=`pwd`
-
-# # install wxWindows
-# cd bld
-# 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 \
-# 	NO_SCRIPTS=1 \
-# 	WXPORT=%{lcport} \
-# 	UNICODE=%{unicode} \
-# 	WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
-# 	install \
-# 	--root=$RPM_BUILD_ROOT
-
-
-
-
 
-# Other "install" tasks...
 cd $WXDIR/wxPython
 
 # install the wxPython headers
@@ -230,92 +215,84 @@ 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}
-
-
-
-
-# Copy icons and make menu entries
-#-- This only works for Mandrake.  Is there a cross-distro way to do it?
-##mkdir -p $RPM_BUILD_ROOT%{_iconsdir}
-##mkdir -p $RPM_BUILD_ROOT%{_miconsdir}
-##mkdir -p $RPM_BUILD_ROOT%{_menudir}
-##install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_32.png $RPM_BUILD_ROOT%{_iconsdir}/PyCrust.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_16.png $RPM_BUILD_ROOT%{_miconsdir}/PyCrust.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_iconsdir}/XRCed.png
-##install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT%{_miconsdir}/XRCed.png
-##
-##cat > $RPM_BUILD_ROOT%{_menudir}/%{name} <<EOF
-##?package(%{name}): command="%_bindir/pyshell" needs="X11" \
-##icon="PyCrust.png" section="Applications/Development" \
-##title="PyShell" longtitle="Python Shell"
-##
-##?package(%{name}): command="%_bindir/pycrust" needs="X11" \
-##icon="PyCrust.png" section="Applications/Development" \
-##title="PyCrust" longtitle="Python Shell with Filling"
-##
-##?package(%{name}): command="%_bindir/pyalamode" needs="X11" \
-##icon="PyCrust.png" section="Applications/Development" \
-##title="PyAlaMode" longtitle="Python Shell with Filling and editor windows"
-##
-##?package(%{name}): command="%_bindir/xrced" needs="X11" \
-##icon="XRCed.png" section="Applications/Development" \
-##title="XRCed" longtitle="wxPython XRC resource editor"
-##
-##EOF
-
-
-
-# Generate the filelists.  For some reason the %defattr below is still
-# resulting in many (but not all) files not owned by root when just
-# specifying directories and wildcards to be included in each package.
-# So instead we'll build some explicit filelists here and use %attr on
-# each entry.
-cd $WXDIR
-# mkdir -p $RPM_BUILD_ROOT%{pref}/share/doc
-# GFL="%{python} wxPython/distrib/genfilelist.py"
-# $GFL    $RPM_BUILD_ROOT %{pref}                     > FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{pref}/bin                >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{pref}/lib                >> FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{pref}/lib/python%{pyver} >> FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{pref}/share              >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{wxpref}                  >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{wxprefbase}              >> FILELIST
-# $GFL    $RPM_BUILD_ROOT %{wxpref}/lib              >> FILELIST
-# $GFL    $RPM_BUILD_ROOT "%{wxpref}/lib/libwx*"     >> FILELIST
-# $GFL -r $RPM_BUILD_ROOT %{wxpref}/share            >> FILELIST
-# ###GFL -r $RPM_BUILD_ROOT %{_iconsdir}               >> FILELIST
-# ##$GFL -r $RPM_BUILD_ROOT %{_menudir}                >> FILELIST
-
-# $GFL    $RPM_BUILD_ROOT %{wxpref}/include           > DEVELLIST
-# $GFL -r $RPM_BUILD_ROOT %{wxpref}/include/wx       >> DEVELLIST
-# $GFL -r $RPM_BUILD_ROOT %{wxpref}/lib/wx           >> DEVELLIST
-# $GFL    $RPM_BUILD_ROOT %{wxconfigname}            >> DEVELLIST
-# $GFL    $RPM_BUILD_ROOT %{wxpref}/bin/wx-config    >> DEVELLIST
+# install KDE & GNOME menus
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Development
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+for d in distrib/*.desktop; do
+	install -m 644 $d $RPM_BUILD_ROOT%{_datadir}/applnk/Development
+	install -m 644 $d $RPM_BUILD_ROOT%{_datadir}/applications
+done
 
+# install KDE icons
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32}/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -m 644 wx/py/PyCrust_16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/PyCrust.png
+install -m 644 wx/py/PyCrust_32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/PyCrust.png
+install -m 644 wx/py/PyCrust_32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/PyCrust.png
+install -m 644 wx/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/XRCed.png
+install -m 644 wx/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/XRCed.png
+install -m 644 wx/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/XRCed.png
+
+# install Mandrake menu
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/menu
+cat > $RPM_BUILD_ROOT%{_libdir}/menu/%{name} <<EOF
+?package(%{name}): \\
+	command="%{_bindir}/pyshell" \\
+	needs="X11" \\
+	icon="PyCrust.png" \\
+	section="Applications/Development/Tools" \\
+	title="PyShell" \\
+	longtitle="GUI Python Shell"
+?package(%{name}): \\
+	command="%{_bindir}/pycrust" \\
+	needs="X11" \\
+	icon="PyCrust.png" \\
+	section="Applications/Development/Tools" \\
+	title="PyCrust" \\
+	longtitle="GUI Python Shell with Filling"
+?package(%{name}): \\
+	command="%{_bindir}/pyalamode" \\
+	needs="X11" \\
+	icon="PyCrust.png" \\
+	section="Applications/Development/Tools" \\
+	title="PyAlaMode" \\
+	longtitle="GUI Python Shell with Filling and editor windows"
+?package(%{name}): \\
+	command="%{_bindir}/xrced" \\
+	needs="X11" \\
+	icon="XRCed.png" \\
+	section="Applications/Development/Tools" \\
+	title="XRCed" \\
+	longtitle="wxPython XRC resource editor"
+EOF
 
-#----------------------------------------------------------------
-##%post
-##%{update_menus}
-##
-##%postun
-##%{clean_menus}
 
+#----------------------------------------------------------------
 
 %pre
 if [ -e %{wxprefbase} ]; then
+	# in case there are old dirs from an old install
 	rm -r %{wxprefbase}
 fi
 
-%postun
-if [ -e %{wxprefbase} ]; then
-	rm %{wxprefbase}
+
+%post
+if [ ! -e %{wxprefbase} ]; then
+	ln -s wxPython-%{version}  %{wxprefbase}
 fi
+# This is done on Mandrake to update its menus:
+if [ -x /usr/bin/update-menus ]; then /usr/bin/update-menus || true ; fi
+
+
+%postun
+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
+
 
 #----------------------------------------------------------------
-#%clean
-#[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
 #----------------------------------------------------------------
@@ -326,9 +303,17 @@ fi
 %doc wxPython/docs/*
 %{_bindir}/*
 %{_libdir}/python%{pyver}/site-packages/*
+%dir %{wxpref}
+%dir %{wxpref}/lib
 %{wxpref}/lib/libwx*
 %{wxpref}/share
-%{wxprefbase}
+%{_datadir}/applnk/Development/*
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/pixmaps/*
+%{_libdir}/menu/*
+
+##%{wxprefbase}
 
 
 %files -n wxPython%{port}-devel