X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=WSoundServer.spec;h=af9bcda2db285fc1a57c6de02c62c70faa97057a;hb=fcada41740af44325dacafbb33d6028292398ff4;hp=9df0660d9acd6d91c269cb17f0900e89538e9efe;hpb=6e19bd3bab0e3450b4eb9c96acfec9d738e19c79;p=packages%2FWSoundServer.git

diff --git a/WSoundServer.spec b/WSoundServer.spec
index 9df0660..af9bcda 100644
--- a/WSoundServer.spec
+++ b/WSoundServer.spec
@@ -4,29 +4,30 @@ Summary(no):	Window Maker lydtjener
 Summary(pl):	Serwer d¼wiêku dla WindowMakera
 Name:		WSoundServer
 Version:	0.4.0
-Release:	3
+Release:	4
 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.bz2
+# Source0-md5:	222dc783c0d77700259ec93f1c2255ac
 Source1:	%{name}.desktop
 Source2:	%{name}-config
-Source3:	%{name}-soundset
-Source4:	wmsdefault.tar.gz
 Patch0:		%{name}-WINGs.patch
 Patch1:		%{name}-rm_unknown_audiofile_compression.patch
+Patch2:		%{name}-acfix.patch
 Icon:		WSoundServer.xpm
-BuildRequires:	libPropList-devel >= 0.8.3
-BuildRequires:	libdockapp-devel
-BuildRequires:	audiofile-devel >= 0.1.9
-BuildRequires:	XFree86-devel
 BuildRequires:	WindowMaker-devel
+BuildRequires:	XFree86-devel
+BuildRequires:	audiofile-devel >= 0.1.9
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libPropList-devel >= 0.8.3
+BuildRequires:	libdockapp-devel
 BuildRequires:	libtool
 Requires:	WindowMaker >= 0.60.0
+Requires:	wmsound-data
+Provides:	wmsoundserver
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	wmsound
-Obsoletes:	WSoundServer-data
 
 %define 	_prefix 	/usr/X11R6
 %define		_mandir		%{_prefix}/man
@@ -82,54 +83,47 @@ Biblioth
 Biblioteki statyczne dla WSoundServer.
 
 %prep
-%setup -q -a4
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 rm -f missing
-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c -f
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %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{%{_applnkdir}/Utilities,%{_pixmapsdir}} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/WindowMaker
 
 %{__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 
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %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 size mtime md5) %{_sysconfdir}/WindowMaker/WMSound
 
 %{_pixmapsdir}/wsoundserver.xpm
 %{_applnkdir}/Utilities/%{name}.desktop
@@ -138,10 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %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