Author: spuk
Date: Sun Feb  4 18:51:47 2007
New Revision: 116156

Modified:
   packages/cooker/wmapm/current/SPECS/wmapm.spec

Log:
- fixed and trimmed dependencies
- spec cleanup
- fixed old menu section
- xdg menu migration for great compliance


Modified: packages/cooker/wmapm/current/SPECS/wmapm.spec
==============================================================================
--- packages/cooker/wmapm/current/SPECS/wmapm.spec      (original)
+++ packages/cooker/wmapm/current/SPECS/wmapm.spec      Sun Feb  4 18:51:47 2007
@@ -10,8 +10,9 @@
 Source11:              wmapm-32x32.png
 Source12:              wmapm-48x48.png
 URL:           http://nis-www.lanl.gov/~mgh/
-Requires:      XFree86-libs, xpm
-BuildRequires: XFree86-devel, xpm-devel
+BuildRequires: libx11-devel
+BuildRequires: libxpm-devel
+BuildRequires: libxext-devel
 BuildRoot:     %{_tmppath}/%{name}-buildroot
 
 %description
@@ -30,14 +31,13 @@
 
 %prep
 rm -rf %buildroot
-
-%setup -n %{name}-%{version}
+%setup -q
 
 %build
 make -C %name COPTS="$RPM_OPT_FLAGS"
 
 %install
-[[ -d %buildroot ]] && rm -rf %buildroot
+[ -d %buildroot ] && rm -rf %buildroot
 
 mkdir -p %buildroot{%_bindir,%_miconsdir,%_liconsdir,%_mandir/man1/}
 install -m 755 wmapm/wmapm %buildroot%_bindir
@@ -50,10 +50,25 @@
 install -m 755 -d %buildroot%_menudir
 cat << EOF > %buildroot%_menudir/%name
 ?package(%{name}):command="%_bindir/%name" icon="%name.png"\\
-                 needs="X11" section="Applications/Monitoring" title="WmApm"\\
-                 longtitle="Battery/Power status monitor in a small icon"
+                 needs="X11" section="System/Monitoring" title="WmApm"\\
+                 longtitle="Battery/Power status monitor in a small icon" \\
+                 xdg="true"
+EOF
+
+install -m 755 -d %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/mandriva-%{name}.desktop <<EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=WmApm
+Comment=%{summary}
+Exec=%{_bindir}/%{name}
+Icon=%{name}
+Terminal=false
+Type=Application
+Categories=X-MandrivaLinux-System-Monitoring;System;Monitor;
 EOF
 
+
 %post
 %{update_menus}
 
@@ -74,4 +89,5 @@
 %_miconsdir/%name.png
 %_iconsdir/%name.png
 %_menudir/%name
+%{_datadir}/applications/mandriva-%{name}.desktop
 %_mandir/man1/*

Reply via email to