Author: spuk
Date: Sun Feb  4 22:08:21 2007
New Revision: 116169

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

Log:
- fixed and trimmed dependencies
- spec cleanup
- xdg menu migration for great compliance
- xmkmf is no more, specifying CCLINK directly in make arg


Modified: packages/cooker/wmsmixer/current/SPECS/wmsmixer.spec
==============================================================================
--- packages/cooker/wmsmixer/current/SPECS/wmsmixer.spec        (original)
+++ packages/cooker/wmsmixer/current/SPECS/wmsmixer.spec        Sun Feb  4 
22:08:21 2007
@@ -1,16 +1,18 @@
 Summary:       Dockapp sound mixer
 Name:          wmsmixer
 Version:       0.5.1
-Release:       2mdk
+Release:       %mkrel 3
 License:       GPL
 Group:         Graphical desktop/WindowMaker
 Source0:       %{name}-%{version}.tar.bz2
 Source1:       %{name}-icons.tar.bz2
 Patch0:                %name.patch.bz2
+# useless to apply, due to unexisting xmkmf; keeping for it being the Right 
fix(?), feel free to remove
 Patch1:                %name-Imakefile.patch.bz2
 URL:           http://www.hibernaculum.net/wmsmixer.html
-Requires:      XFree86-libs, xpm
-BuildRequires: XFree86-devel, xpm-devel
+BuildRequires: libx11-devel
+BuildRequires: libxpm-devel
+BuildRequires: libxext-devel
 BuildRoot:     %{_tmppath}/%{name}-buildroot
 
 %description
@@ -32,15 +34,12 @@
 
 %prep
 rm -rf %buildroot
-
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %patch0 -p1
-%patch1 -p1
 
 %build
-xmkmf
-CFLAGS="$RPM_OPT_FLAGS" make %name
+CFLAGS="$RPM_OPT_FLAGS" make CCLINK=c++ %name
 
 %install
 [ -d %buildroot ] && rm -rf %buildroot
@@ -59,7 +58,20 @@
 cat << EOF > %buildroot%{_menudir}/%{name}
 ?package(%{name}):command="%{_bindir}/%{name}" icon="%{name}.png"\\
                  needs="X11" section="Multimedia/Sound" title="WmsMixer"\\
-                 longtitle="Dockapp sound mixer"
+                 longtitle="Dockapp sound mixer" xdg="true"
+EOF
+
+install -m 755 -d %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/mandriva-%{name}.desktop <<EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=WmsMixer
+Comment=%{summary}
+Exec=%{_bindir}/%{name}
+Icon=%{name}
+Terminal=false
+Type=Application
+Categories=X-MandrivaLinux-Multimedia-Sound;Audio;Mixer;
 EOF
 
 %clean
@@ -78,4 +90,5 @@
 %{_liconsdir}/%{name}.png
 %{_miconsdir}/%{name}.png
 %{_iconsdir}/%{name}.png
+%{_datadir}/applications/mandriva-%{name}.desktop
 %{_menudir}/%{name}

Reply via email to