Author: spuk
Date: Wed Jan 31 06:49:21 2007
New Revision: 115628

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

Log:
- fixed and stripped BuildRequires to minimum
- stopped using old "X prefix"
- added XDG menu for great compliance
- fixed menu section of old menu


Modified: packages/cooker/wmwebcam/current/SPECS/wmwebcam.spec
==============================================================================
--- packages/cooker/wmwebcam/current/SPECS/wmwebcam.spec        (original)
+++ packages/cooker/wmwebcam/current/SPECS/wmwebcam.spec        Wed Jan 31 
06:49:21 2007
@@ -1,5 +1,5 @@
 %define version 0.3.5
-%define release %mkrel 6
+%define release %mkrel 7
 %define name wmwebcam
 %define title WmWebcam 
 
@@ -14,10 +14,9 @@
 Source2:    %{name}.32x32.png.bz2
 Source3:    %{name}.48x48.png.bz2
 URL:           http://fragment.stc.cx/?abd
-Requires:      XFree86-libs
-BuildRequires: XFree86-devel libjpeg-devel
-Buildrequires: libxpm-devel
-Prefix:                /usr/X11R6
+Buildrequires: libjpeg-devel
+Buildrequires: libx11-devel
+Buildrequires: libxext-devel
 BuildRoot:     %{_tmppath}/%{name}-buildroot
 
 %description
@@ -31,8 +30,7 @@
 
 %prep
 rm -rf $RPM_BUILD_ROOT
-
-%setup
+%setup -q
 
 %build
  
@@ -41,8 +39,8 @@
 %install
 [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
 
-install -m 755 -d $RPM_BUILD_ROOT/usr/X11R6/bin
-install -m 755 {wmwebcam,wmwebcam.pl} $RPM_BUILD_ROOT/usr/X11R6/bin/
+install -m 755 -d $RPM_BUILD_ROOT%{_bindir}
+install -m 755 {wmwebcam,wmwebcam.pl} $RPM_BUILD_ROOT%{_bindir}
 
 install -m 755 -d $RPM_BUILD_ROOT%{_miconsdir}
 install -m 755 -d $RPM_BUILD_ROOT%{_iconsdir}
@@ -53,11 +51,26 @@
 
 install -m 755 -d $RPM_BUILD_ROOT%{_menudir}
 cat << EOF > $RPM_BUILD_ROOT%{_menudir}/%{name}
-?package(%{name}):command="%{prefix}/bin/%{name}" icon="%{name}.png"\\
-                 needs="X11" section="Applications/Monitoring" 
title="%{title}"\\
-                 longtitle="Watch your own webcam in a small dockapp window"
+?package(%{name}):command="%{_bindir}/%{name}" icon="%{name}.png"\\
+                 needs="X11" section="Multimedia/Video" title="%{title}"\\
+                 longtitle="Watch your own webcam in a small dockapp window"\\
+                 xdg="true"
+EOF
+
+mkdir -p %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/mandriva-%{name}.desktop <<EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=%{title}
+Comment=%{summary}
+Exec=%{_bindir}/%{name}
+Icon=%{name}
+Terminal=false
+Type=Application
+Categories=X-MandrivaLinux-Multimedia-Video;AudioVideo;TV;Tuner;
 EOF
 
+
 %post
 %{update_menus}
 
@@ -72,8 +85,9 @@
 %files
 %defattr (-,root,root)
 %doc README Changelog COPYING
-%{prefix}/bin/*
+%{_bindir}/*
 %{_liconsdir}/%{name}.png
 %{_miconsdir}/%{name}.png
 %{_iconsdir}/%{name}.png
 %{_menudir}/%{name}
+%{_datadir}/applications/mandriva-%{name}.desktop

Reply via email to