- use sounds in separate package - the same for WSoundServer and wmsound

- added fix for autoconf 2.53
- release 4

Changed files:
    WSoundServer.spec -> 1.40

diff --git a/WSoundServer.spec b/WSoundServer.spec
index 9eaa56a4f123793a06a284d873067a6ebf286504..899bbb76fa25b47ee73ee2916b20609ee47a043f 100644 (file)
--- a/WSoundServer.spec
+++ b/WSoundServer.spec
@@ -4,29 +4,29 @@ 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
 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,9 +82,10 @@ Biblioth
 Biblioteki statyczne dla WSoundServer.
 
 %prep
-%setup -q -a4
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 rm -f missing
@@ -98,38 +99,30 @@ aclocal
 
 %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,7 +131,6 @@ 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