X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=WSoundServer.spec;h=33f4dd205ce509da1df828dcb3a78455098d0feb;hb=e465bec14adeb2c75298708ab08e2bfc44826827;hp=ad85135a0f862f16ec64f8df9650eea9418bf517;hpb=58691e1a32dd69e74e30d7e3c63704d576686ad4;p=packages%2FWSoundServer.git

diff --git a/WSoundServer.spec b/WSoundServer.spec
index ad85135..33f4dd2 100644
--- a/WSoundServer.spec
+++ b/WSoundServer.spec
@@ -1,147 +1,140 @@
 Summary:	WindowMaker sound server
-Summary(fr):	Serveur de son de Window Maker
-Summary(no):	Window Maker lydtjener
-Summary(pl):	Serwer d¼wiêku dla WindowMakera
+Summary(fr.UTF-8):	Serveur de son de Window Maker
+Summary(nb.UTF-8):	Window Maker lydtjener
+Summary(pl.UTF-8):	Serwer dźwięku dla WindowMakera
 Name:		WSoundServer
-Version:	0.4.0
-Release:	3
+Version:	0.4.1
+Release:	5
 License:	GPL
 Group:		X11/Window Managers/Tools
-Source0:	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/%{name}-%{version}.tar.bz2
+Source0:	http://largo.windowmaker.org/files/%{name}-%{version}.tar.gz
+# Source0-md5:	cfc8d0bdf97e7b165790cf266d40670e
 Source1:	%{name}.desktop
 Source2:	%{name}-config
-Source3:	%{name}-soundset
-Source4:	wmsdefault.tar.gz
-Patch0:		%{name}-WINGs.patch
+Patch0:		%{name}-libdockapp.patch
 Patch1:		%{name}-rm_unknown_audiofile_compression.patch
-Icon:		WSoundServer.xpm
-BuildRequires:	libPropList-devel >= 0.8.3
-BuildRequires:	libdockapp-devel
-BuildRequires:	audiofile-devel >= 0.1.9
-BuildRequires:	XFree86-devel
+Patch2:		%{name}-acfix.patch
+Patch3:		%{name}-asneeded.patch
+URL:		http://largo.windowmaker.org/files.php#WSoundServer
 BuildRequires:	WindowMaker-devel
+BuildRequires:	audiofile-devel >= 0.1.9
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	esound-devel
+BuildRequires:	libPropList-devel >= 0.8.3
+BuildRequires:	libdockapp-devel
 BuildRequires:	libtool
+BuildRequires:	xorg-proto-xproto-devel
 Requires:	WindowMaker >= 0.60.0
+Provides:	wmsoundserver
+Obsoletes:	wmsoundserver
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:	wmsound
-Obsoletes:	WSoundServer-data
 
-%define 	_prefix 	/usr/X11R6
-%define		_mandir		%{_prefix}/man
 %define		_sysconfdir	/etc/X11
 
 %description
 WSoundServer is the sound server for WindowMaker.
 
-%description -l fr
+%description -l fr.UTF-8
 WSoundServer est le serveur de son pour Window Maker.
 
-%description -l no
+%description -l nb.UTF-8
 WSoundServer er en lydtjener for Window Maker.
 
-%description -l pl
-WSoundServer jest serwerem d¼wiêku dla WindowMakera.
+%description -l pl.UTF-8
+WSoundServer jest serwerem dźwięku dla WindowMakera.
 
 %package devel
 Summary:	WSoundServer libraries and headers
-Summary(no):	Utviklings bibliotek for WSoundServer
-Summary(fr):	Bibliothèques et includes pour WSoundServer
-Summary(pl):	Biblioteki i pliki nag³ówkowe dla WSoundServer
+Summary(nb.UTF-8):	Utviklings bibliotek for WSoundServer
+Summary(fr.UTF-8):	Bibliothèques et includes pour WSoundServer
+Summary(pl.UTF-8):	Biblioteki i pliki nagłówkowe dla WSoundServer
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	wmsound-devel
 
 %description devel
 WSoundServer libraries and headers.
 
-%description devel -l fr
-Bibliothèques et includes pour WSoundServer.
+%description devel -l fr.UTF-8
+Bibliothèques et includes pour WSoundServer.
 
-%description devel -l no
-WSoundServer biblioteket samt «headerfilen».
+%description devel -l nb.UTF-8
+WSoundServer biblioteket samt «headerfilen».
 
-%description devel -l pl
-Biblioteki i pliki nag³ówkowe dla WSoundServer.
+%description devel -l pl.UTF-8
+Biblioteki i pliki nagłówkowe dla WSoundServer.
 
 %package static
 Summary:	WSoundServer static libraries
-Summary(fr):	Bibliothèques statiques pour WSoundServer
-Summary(pl):	Biblioteki statyczne dla WSoundServer
+Summary(fr.UTF-8):	Bibliothèques statiques pour WSoundServer
+Summary(pl.UTF-8):	Biblioteki statyczne dla WSoundServer
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 WSoundServer static libraries.
 
-%description static -l fr
-Bibliothèques statiques pour WSoundServer.
+%description static -l fr.UTF-8
+Bibliothèques statiques pour WSoundServer.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Biblioteki statyczne dla WSoundServer.
 
 %prep
-%setup -q -a4
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-rm -f missing
-libtoolize --copy --force
-aclocal
+%{__libtoolize}
+%{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure 
+%configure
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_applnkdir}/Utilities \
-	$RPM_BUILD_ROOT%{_sysconfdir}/WindowMaker \
-	$RPM_BUILD_ROOT%{_datadir}/{pixmaps,WindowMaker/{SoundSets,Sounds}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/WindowMaker
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install src/wsoundserver.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install src/wsoundserver.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 
-install %{SOURCE1}   $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE2}   $RPM_BUILD_ROOT%{_sysconfdir}/WindowMaker/WMSound
-install %{SOURCE3}   $RPM_BUILD_ROOT%{_datadir}/WindowMaker/SoundSets/Default
-install Sounds/*.wav $RPM_BUILD_ROOT%{_datadir}/WindowMaker/Sounds
-
-gzip -9nf README ChangeLog AUTHORS 
-
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/WindowMaker/WMSound
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/getsoundset
 %attr(755,root,root) %{_bindir}/setsoundset
 %attr(755,root,root) %{_bindir}/wsound*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%dir %{_datadir}/WindowMaker/Sounds
-%dir %{_datadir}/WindowMaker/SoundSets
-%{_datadir}/WindowMaker/Sounds/*.wav
-%config %verify(not size mtime md5) %{_datadir}/WindowMaker/SoundSets/Default
-%config %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/*
 
 %files devel
 %defattr(644,root,root,755)
-%doc *.gz
 %attr(755,root,root) %{_bindir}/get-wsound-flags
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_libdir}/lib*.la
 %{_includedir}/*.h
 
 %files static