--- misc/macros.jpackage	2010-05-21 23:33:58.000000000 +0300
+++ misc/macros.jpackage	2011-09-03 10:29:43.000000000 +0300
@@ -173,26 +173,26 @@
 #==============================================================================
 # ---- default icons directories as per the icon theme freedesktop spec
 
-%_iconstheme    hicolor
-%_iconsbasedir  %{_datadir}/icons/%{_iconstheme}
+#_iconstheme    hicolor
+#_iconsbasedir  %{_datadir}/icons/%{_iconstheme}
 
 #
 # The following is a bit heavy and will be removed
 #
-%_icons16dir    %{_iconsbasedir}/16x16/apps
-%_icons22dir    %{_iconsbasedir}/22x22/apps
-%_icons48dir    %{_iconsbasedir}/48x48/apps
-%_icons64dir    %{_iconsbasedir}/64x64/apps
-%_icons96dir    %{_iconsbasedir}/96x96/apps
-%_icons192dir   %{_iconsbasedir}/192x192/apps
-%_iconsscaldir  %{_iconsbasedir}/scalable/apps
+#_icons16dir    %{_iconsbasedir}/16x16/apps
+#_icons22dir    %{_iconsbasedir}/22x22/apps
+#_icons48dir    %{_iconsbasedir}/48x48/apps
+#_icons64dir    %{_iconsbasedir}/64x64/apps
+#_icons96dir    %{_iconsbasedir}/96x96/apps
+#_icons192dir   %{_iconsbasedir}/192x192/apps
+#_iconsscaldir  %{_iconsbasedir}/scalable/apps
 
 #
 # Mandriva macros for non-Mandriva systems.
 #
-%_miconsdir	%{_datadir}/icons/mini
-%_iconsdir	%{_datadir}/icons
-%_liconsdir	%{_datadir}/icons/large
+#_miconsdir	%{_datadir}/icons/mini
+#_iconsdir	%{_datadir}/icons
+#_liconsdir	%{_datadir}/icons/large
 
 
 #
@@ -203,7 +203,7 @@
 #
 %mdkicons() \
 install -D -m 644 %1-48.png $RPM_BUILD_ROOT%{_liconsdir}/%1.png\
-install -D -m 644 %1-32.png $RPM_BUILD_ROOT%{_iconsdir}/%1.png\
+install -D -m 644 %1-32.png $RPM_BUILD_ROOT%{_niconsdir}/%1.png\
 install -D -m 644 %1-16.png $RPM_BUILD_ROOT%{_miconsdir}/%1.png\
 %{nil}
 
@@ -223,12 +223,12 @@
 #==============================================================================
 # ---- default .desktop directories per the desktop-entry freedesktop.org spec
 
-%_desktopdir    %{_datadir}/applications
+#_desktopdir    %{_datadir}/applications
 
 #
 # Mandriva menu dir
 #
-%_menudir	%{_prefix}/lib/menu
+#_menudir	%{_prefix}/lib/menu
 
 #
 # Mandriva menu
@@ -243,27 +243,11 @@
 # %8	icon (ex: %{name}.png)
 # %9	unused
 #
-%mdkmenu() \
-install -d -m 755 $RPM_BUILD_ROOT%{_menudir}\
-cat >$RPM_BUILD_ROOT%{_menudir}/%1 <<EOF\
-\?package(%1):\\
- command="%2"\\
- needs="%3"\\
- section="%4"\\
- mimetypes="%5"\\
- title="%6"\\
- longtitle="%7"\\
- icon="%8"\\
-EOF\
-%{nil}
+%mdkmenu() %{warn INFO: mdkmenu is obsolete}%{nil}
+
+%post_mdkmenu %{warn INFO: mdkmenu is obsolete}%{nil}
 
-%post_mdkmenu\
-%post mdkmenu\
-%{update_menus}
-
-%postun_mdkmenu\
-%postun mdkmenu\
-%{clean_menus}
+%postun_mdkmenu %{warn INFO: mdkmenu is obsolete}%{nil}
 
 #
 # Legacy menu