- don't rebuild menu in %post if shouldn't, rel. 2

Changed files:
    xfdesktop.spec -> 1.35

diff --git a/xfdesktop.spec b/xfdesktop.spec
index 397b3655ceecf45fe2708a38c4912808c6d39c18..98a6cdc7924a4dd7f0c351c70d9095dd92bdfa73 100644 (file)
--- a/xfdesktop.spec
+++ b/xfdesktop.spec
@@ -2,7 +2,7 @@ Summary:        Desktop manager for the XFce Desktop Environment
 Summary(pl):   Zarz±dca pulpitu dla ¶rodowiska XFce
 Name:          xfdesktop
 Version:       4.0.6
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications
 #Source0:      ftp://ftp.berlios.de/pub/xfce-goodies/%{version}/%{name}-%{version}.tar.gz
@@ -24,7 +24,7 @@ Requires(post):       vfmg >= 0.9.16-2
 Requires:      libxfce4mcs >= %{version}
 Requires:      libxfcegui4 >= %{version}
 Requires:      libxml2 >= 2.4.0
-Requires:      vfmg > 0.9.16-2
+Requires:      vfmg >= 0.9.16-2
 Requires:      xfce-mcs-manager >= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,7 +70,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.{la,a}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-vfmg -i -f -x -c -u -m xfce4 > %{_sysconfdir}/xfce4/menu2.xml 2>/dev/null
+# generate initial menu
+[ -f /etc/sysconfig/vfmg ] && . /etc/sysconfig/vfmg
+[ $XFCE4 = yes -o $XFCE4 = 1 -o ! -f %{_sysconfdir}/xfce4/menu2.xml ] && \
+       vfmg -i -f -x -c -u -m xfce4 > %{_sysconfdir}/xfce4/menu2.xml 2>/dev/null ||:
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)