X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..aeec2045cf0fd285e12546dc4eceb9440c3dec51:/wxPython/distrib/wxPythonFull.spec.in

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index fa0745bb6f..a0f1ca2b36 100644
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -8,7 +8,8 @@
 %define version @VERSION@
 %define ver2    @VER2@
 %define release 1
-%define wxpref  %{pref}/lib/wxPython
+%define wxpref  %{pref}/lib/wxPython-%{version}
+%define wxprefbase %{pref}/lib/wxPython
 %define name    wxPython%{port}-py%{pyver}
 
 
@@ -28,8 +29,12 @@
 # build the name of the real wx-config from the port, flags, etc.
 %define dbgflg %(if [ "%{debug_flag}" = "1" ]; then echo d; fi)
 %define uniflg %(if [ "%{unicode}" = "1" ]; then echo u; fi)
+%define DBGFLG %(if [ "%{debug_flag}" = "1" ]; then echo D; fi)
+%define UNIFLG %(if [ "%{unicode}" = "1" ]; then echo U; fi)
 %define wxconfigname %{wxpref}/bin/wx%{lcport}%{uniflg}%{dbgflg}-%{ver2}-config
 
+# turn off the generation of debuginfo rpm  (RH9)
+%define debug_package %{nil}
 
 #----------------------------------------------------------------
 Summary:   Cross platform GUI toolkit for Python using wx%{port}
@@ -43,13 +48,18 @@ Packager:  Robin Dunn <robin@alldunn.com>
 Group:     Development/Python
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Prefix:    %{pref}
-#BuildRequires: %{python}
 
 Provides: wxPython  = %{version}
 Provides: wxPython%{port}  = %{version}
 
+Provides: libwx_%{lcport}%{uniflg}%{dbgflg}-%{ver2}.so
+Provides: libwx_%{lcport}%{uniflg}%{dbgflg}-%{ver2}.so(WX%{port}%{UNIFLG}%{DBGFLG}_%{ver2})
+Provides: libwx_%{lcport}%{uniflg}%{dbgflg}_gl-%{ver2}.so
+Provides: libwx_%{lcport}%{uniflg}%{dbgflg}_gl-%{ver2}.so(WX%{port}%{UNIFLG}%{DBGFLG}_%{ver2})
+
+
 # old wxPython packages
-Obsoletes: wxPython
+Obsoletes: wxPython wxPython%{port}
 
 
 %description
@@ -127,8 +137,6 @@ cd $WXDIR/wxPython
 	WX_CONFIG="$WXDIR/build/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/build" \
 	build
 
-##	WX_CONFIG="$WXDIR/build/wx-config --inplace --prefix=$RPM_BUILD_ROOT%{wxpref}" \
-
 
 
 # Build wxrc (XRC resource tool) but don't use the makefiles since they expect
@@ -138,7 +146,7 @@ WX_CONFIG="$WXDIR/build/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/build"
 wCC=`$WX_CONFIG --cc`
 wCXX=`$WX_CONFIG --cxx`
 
-for f in wxrc.cpp ../../src/xrc/*.cpp; do
+for f in wxrc.cpp ../../src/xrc/xml.cpp ../../src/xrc/xmlres.cpp; do
     echo $f
     $wCXX `$WX_CONFIG --cxxflags` -I ../../include -I ../../src/xrc/expat/xmlparse -I ../../src/xrc/expat/xmltok -c $f
 done
@@ -147,9 +155,6 @@ for f in ../../src/xrc/expat/xmlparse/xmlparse.c ../../src/xrc/expat/xmltok/xmlr
     $wCC `$WX_CONFIG --cxxflags` -I ../../include -I ../../src/xrc/expat/xmlparse -I ../../src/xrc/expat/xmltok -c $f
 done
 
-# the handlers are not needed
-rm xh_*.o xmlrsall.o
-
 $wCXX `$WX_CONFIG --libs` *.o -o wxrc
 strip wxrc
 
@@ -189,8 +194,10 @@ for s in \
 	img2png \
 	img2py \
 	img2xpm \
+	pyalacarte \
+	pyalamode \
 	pycrust \
-	pycwrap \
+	pywrap \
 	pyshell \
 	xrced; do
     cp scripts/$s $RPM_BUILD_ROOT/%{pref}/bin
@@ -201,6 +208,37 @@ done
 cp $WXDIR/contrib/utils/wxrc/wxrc $RPM_BUILD_ROOT/%{pref}/bin
 
 
+# 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.
@@ -218,6 +256,8 @@ $GFL    $RPM_BUILD_ROOT %{wxpref}                  >> 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
@@ -226,6 +266,25 @@ $GFL    $RPM_BUILD_ROOT %{wxconfigname}            >> DEVELLIST
 $GFL    $RPM_BUILD_ROOT %{wxpref}/bin/wx-config    >> DEVELLIST
 
 
+#----------------------------------------------------------------
+##%post
+##%{update_menus}
+##
+##%postun
+##%{clean_menus}
+
+
+%post
+if [ -e %{wxprefbase} ]; then
+	rm %{wxprefbase}
+fi
+ln -s %{wxpref} %{wxprefbase}
+
+%postun
+if [ -e %{wxprefbase} ]; then
+	rm %{wxprefbase}
+fi
+
 #----------------------------------------------------------------
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -237,7 +296,7 @@ $GFL    $RPM_BUILD_ROOT %{wxpref}/bin/wx-config    >> DEVELLIST
 %defattr(-,root,root)
 %doc docs/preamble.txt docs/licence.txt docs/readme.txt docs/changes.txt
 %doc wxPython/README.txt wxPython/CHANGES.txt
-
+%doc wxPython/docs/*
 
 %files -n wxPython%{port}-devel -f DEVELLIST
 %defattr(-,root,root)