- updated to 0.4.0,

- merge data subpackage with main,
- move %doc to devel,
- added rm_unknown_audiofile_compression and WINGs patches.

Changed files:
    WSoundServer.spec -> 1.30

diff --git a/WSoundServer.spec b/WSoundServer.spec
index eee93d19442d0e8dbe7a18ef91e12aa365f028c8..acc18495f3e596a75de18d82af12e0ea8b0b9650 100644 (file)
--- a/WSoundServer.spec
+++ b/WSoundServer.spec
@@ -3,16 +3,19 @@ Summary(fr):  Serveur de son de Window Maker
 Summary(no):   Window Maker lydtjener
 Summary(pl):   Serwer d¼wiêku dla WindowMakera
 Name:          WSoundServer
-Version:       0.2.2
-Release:       4
+Version:       0.4.0
+Release:       1
+License:       GPL
 Group:         X11/Window Managers/Tools
+Group(de):     X11/Fenstermanager/Werkzeuge
 Group(pl):     X11/Zarz±dcy Okien/Narzêdzia
-License:       GPL
 Source0:       ftp://shadowmere.student.utwente.nl/pub/WindowMaker/%{name}-%{version}.tar.bz2
-Source1:       WSoundServer.desktop
-Source2:       WSoundServer-config
-Source3:       WSoundServer-soundset
+Source1:       %{name}.desktop
+Source2:       %{name}-config
+Source3:       %{name}-soundset
 Source4:       wmsdefault.tar.gz
+Patch0:                %{name}-WINGs.patch
+Patch1:                %{name}-rm_unknown_audiofile_compression.patch
 Icon:          WSoundServer.xpm
 BuildRequires: libPropList-devel >= 0.8.3
 BuildRequires: libdockapp-devel
@@ -21,8 +24,9 @@ BuildRequires:        XFree86-devel
 BuildRequires: WindowMaker-devel
 Requires:      WindowMaker >= 0.60.0
 Requires:      WSoundServer-data
-Obsoletes:     wmsound
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:     wmsound
+Obsoletes:     WSoundServer-data
 
 %define        _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
@@ -40,33 +44,13 @@ WSoundServer er en lydtjener for Window Maker.
 %description -l pl
 WSoundServer jest serwerem d¼wiêku dla WindowMakera.
 
-%package data
-Summary:       WSoundServer data
-Summary(fr):   Données de WSoundServer
-Summary(no):   Data til WSoundServer
-Summary(pl):   Pliki z danymi dla WSoundServer
-Group:         X11/Window Managers/Tools
-Group(pl):     X11/Zarz±dcy Okien/Narzêdzia
-Obsoletes:     wmsound-data
-
-%description data
-The standard WSoundServer data.
-
-%description data -l fr
-Les données standard de WSoundServer.
-
-%description data -l no
-Standard datafiler til WSoundServer.
-
-%description data -l pl
-Standardowe pliki d¼wiêkowe dla WSoundServer.
-
 %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
 Group:         X11/Development/Libraries
+Group(de):     X11/Entwicklung/Libraries
 Group(pl):     X11/Programowanie/Biblioteki
 Requires:      %{name} = %{version}
 Obsoletes:     wmsound-devel
@@ -88,6 +72,7 @@ Summary:      WSoundServer static libraries
 Summary(fr):   Bibliothèques statiques pour WSoundServer
 Summary(pl):   Biblioteki statyczne dla WSoundServer
 Group:         X11/Development/Libraries
+Group(de):     X11/Entwicklung/Libraries
 Group(pl):     X11/Programowanie/Biblioteki
 Requires:      %{name}-devel = %{version}
 
@@ -102,6 +87,8 @@ Biblioteki statyczne dla WSoundServer.
 
 %prep
 %setup -q -a4
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure 
@@ -133,27 +120,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc {README,ChangeLog,AUTHORS}.gz
 %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.*.*
-
-%{_pixmapsdir}/wsoundserver.xpm
-%{_applnkdir}/Utilities/%{name}.desktop
-
-%{_mandir}/man1/*
-
-%files data
-%defattr(644,root,root,755)
 %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
 
+%{_pixmapsdir}/wsoundserver.xpm
+%{_applnkdir}/Utilities/%{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