-# Install wxrc
-cp $WXDIR/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
-
-
-#----------------------------------------------------------------
-##%post
-##%{update_menus}
-##
-##%postun
-##%{clean_menus}
-
-
-%pre
-if [ -e %{wxprefbase} ]; then
- rm -r %{wxprefbase}
+
+# install KDE & GNOME menu items
+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 items
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/menu
+cat > $RPM_BUILD_ROOT%{_libdir}/menu/%{pkgname} <<EOF
+?package(%{pkgname}): \\
+ command="%{_bindir}/pyshell" \\
+ needs="X11" \\
+ icon="PyCrust.png" \\
+ section="Applications/Development/Tools" \\
+ title="PyShell" \\
+ longtitle="GUI Python Shell"
+?package(%{pkgname}): \\
+ command="%{_bindir}/pycrust" \\
+ needs="X11" \\
+ icon="PyCrust.png" \\
+ section="Applications/Development/Tools" \\
+ title="PyCrust" \\
+ longtitle="GUI Python Shell with Filling"
+?package(%{pkgname}): \\
+ command="%{_bindir}/pyalamode" \\
+ needs="X11" \\
+ icon="PyCrust.png" \\
+ section="Applications/Development/Tools" \\
+ title="PyAlaMode" \\
+ longtitle="GUI Python Shell with Filling and editor windows"
+?package(%{pkgname}): \\
+ command="%{_bindir}/xrced" \\
+ needs="X11" \\
+ icon="XRCed.png" \\
+ section="Applications/Development/Tools" \\
+ title="XRCed" \\
+ longtitle="wxPython XRC resource editor"
+EOF
+
+
+#----------------------------------------------------------------------
+
+%post -n %{pkgname}%{ver2}-%{port}-%{chartype}
+if [ ! -e %{wxprefbase} ]; then
+ ln -s %{pkgname}-%{version}-%{port}-%{chartype} %{wxprefbase}