X-Git-Url: http://git.pld-linux.org/?p=packages%2FWSoundServer.git;a=blobdiff_plain;f=WSoundServer.spec;h=b6bdaabf5936e8b34a044a76baea53b32bdb9a7c;hp=77d5ffe42628e7153e56efe306ff36f1194c99d3;hb=f679c434ffb5628556a8faee60cc6a383936d0d8;hpb=e46562180111977e71613369ed48ea066c6784c0

diff --git a/WSoundServer.spec b/WSoundServer.spec
index 77d5ffe..b6bdaab 100644
--- a/WSoundServer.spec
+++ b/WSoundServer.spec
@@ -1,20 +1,20 @@
 Summary:	WindowMaker sound server
 Summary(fr):	Serveur de son de Window Maker
-Summary(no):	Window Maker lydtjener
+Summary(nb):	Window Maker lydtjener
 Summary(pl):	Serwer d¼wiêku dla WindowMakera
 Name:		WSoundServer
-Version:	0.4.0
-Release:	4
+Version:	0.4.1
+Release:	2
 License:	GPL
 Group:		X11/Window Managers/Tools
-Source0:	http://largo.windowmaker.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	222dc783c0d77700259ec93f1c2255ac
+Source0:	http://largo.windowmaker.org/files/%{name}-%{version}.tar.gz
+# Source0-md5:	cfc8d0bdf97e7b165790cf266d40670e
 Source1:	%{name}.desktop
 Source2:	%{name}-config
-Patch0:		%{name}-WINGs.patch
+Patch0:		%{name}-libdockapp.patch
 Patch1:		%{name}-rm_unknown_audiofile_compression.patch
 Patch2:		%{name}-acfix.patch
-Icon:		WSoundServer.xpm
+URL:		http://largo.windowmaker.org/files.php#WSoundServer
 BuildRequires:	WindowMaker-devel
 BuildRequires:	XFree86-devel
 BuildRequires:	audiofile-devel >= 0.1.9
@@ -24,13 +24,10 @@ BuildRequires:	libPropList-devel >= 0.8.3
 BuildRequires:	libdockapp-devel
 BuildRequires:	libtool
 Requires:	WindowMaker >= 0.60.0
-Requires:	wmsound-data
 Provides:	wmsoundserver
+Obsoletes:	wmsoundserver
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:	wmsound
 
-%define 	_prefix 	/usr/X11R6
-%define		_mandir		%{_prefix}/man
 %define		_sysconfdir	/etc/X11
 
 %description
@@ -39,7 +36,7 @@ WSoundServer is the sound server for WindowMaker.
 %description -l fr
 WSoundServer est le serveur de son pour Window Maker.
 
-%description -l no
+%description -l nb
 WSoundServer er en lydtjener for Window Maker.
 
 %description -l pl
@@ -47,11 +44,11 @@ WSoundServer jest serwerem d
 
 %package devel
 Summary:	WSoundServer libraries and headers
-Summary(no):	Utviklings bibliotek for WSoundServer
+Summary(nb):	Utviklings bibliotek for WSoundServer
 Summary(fr):	Bibliothèques et includes pour WSoundServer
 Summary(pl):	Biblioteki i pliki nag³ówkowe dla WSoundServer
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	wmsound-devel
 
 %description devel
@@ -60,7 +57,7 @@ WSoundServer libraries and headers.
 %description devel -l fr
 Bibliothèques et includes pour WSoundServer.
 
-%description devel -l no
+%description devel -l nb
 WSoundServer biblioteket samt «headerfilen».
 
 %description devel -l pl
@@ -71,7 +68,7 @@ Summary:	WSoundServer static libraries
 Summary(fr):	Bibliothèques statiques pour WSoundServer
 Summary(pl):	Biblioteki statyczne dla WSoundServer
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 WSoundServer static libraries.
@@ -89,18 +86,17 @@ Biblioteki statyczne dla WSoundServer.
 %patch2 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure 
+%configure
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Utilities,%{_pixmapsdir}} \
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/WindowMaker
 
 %{__make} install \
@@ -108,13 +104,13 @@ install -d $RPM_BUILD_ROOT{%{_applnkdir}/Utilities,%{_pixmapsdir}} \
 
 install src/wsoundserver.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 
-install %{SOURCE1}   $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE2}   $RPM_BUILD_ROOT%{_sysconfdir}/WindowMaker/WMSound
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/WindowMaker/WMSound
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
@@ -124,10 +120,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/setsoundset
 %attr(755,root,root) %{_bindir}/wsound*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/WindowMaker/WMSound
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/WindowMaker/WMSound
 
 %{_pixmapsdir}/wsoundserver.xpm
-%{_applnkdir}/Utilities/%{name}.desktop
+%{_desktopdir}/%{name}.desktop
 
 %{_mandir}/man1/*