- cosmetics

[packages/wavplay.git] / wavplay.spec

diff --git a/wavplay.spec b/wavplay.spec
index 32504e22202b065a78a3fd528d701034380f791c..1e6bfdf64a3310885f2b692c044a2933a3558ea6 100644 (file)
--- a/wavplay.spec
+++ b/wavplay.spec
@@ -1,19 +1,24 @@
-Summary:       play wav files under Linux
-Summary(pl):   Odtwarzacz plików d¼wiêkowych wav pod Linuksa
+Summary:       Play WAV files under Linux
+Summary(pl):   Odtwarzacz plików d¼wiêkowych WAV pod Linuksa
 Name:          wavplay
 Version:       1.4
-Release:       5
+Release:       9
 License:       GPL
 Group:         Applications/Sound
-URL:           http://www.vaxxine.com/ve3wwg/gnuwave.html
 Source0:       ftp://sunsite.unc.edu/pub/Linux/apps/sound/players/%{name}-%{version}.tar.gz
+# Source0-md5: 726c58f47c0dbc3b58ff6c42300d518e
 Patch0:                %{name}-make+res.patch
 Patch1:                %{name}-X11.patch
 Patch2:                %{name}-va_arg_fix.patch
+Patch3:                %{name}-types.patch
+Patch4:                %{name}-nonblock.patch
+URL:           http://www.vaxxine.com/ve3wwg/gnuwave.html
 BuildRequires: XFree86-devel
 BuildRequires: motif-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _appdefsdir     /usr/X11R6/lib/X11/app-defaults
+
 %description
 Wavplay is a simple command-line tool that allows to play WAV audio
 files under Linux.
@@ -25,40 +30,41 @@ d
 %package X11
 Summary:       xltwavplay utility
 Summary(pl):   Narzêdzie "xltwavplay"
-Group:         X11/Applications/Multimedia
-Requires:      %{name} = %{version}
-Requires:      XFree86-libs
+Group:         X11/Applications/Sound
+Requires:      %{name} = %{version}-%{release}
 
 %description X11
 The xltwavplay program now allows the user to point and click his way
-through the playing of selected wav files, changing of options and
+through the playing of selected WAV files, changing of options and
 performing recordings.
 
 %description X11 -l pl
 Program xltwavplay pozwala u¿ytkownikowi szybko i ³atwo odgrywaæ
-wybrane pliki wav, zmieniaæ ustawienia oraz nagrywaæ w³asne pliki.
+wybrane pliki WAV, zmieniaæ ustawienia oraz nagrywaæ w³asne pliki.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__make} \
        CC=%{__cc} \
        OPT="%{rpmcflags}" \
+       XLDOPTS="-L/usr/X11R6/%{_lib} -lXm -lXmu -lXt -lX11" \
        INSTDIR=%{_bindir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} \
-       $RPM_BUILD_ROOT%{_prefix}/X11R6/{bin,lib/X11/app-defaults}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_appdefsdir}}
 
 %{__make} install \
        INSTDIR=$RPM_BUILD_ROOT%{_bindir} \
-       XINSTDIR=$RPM_BUILD_ROOT%{_prefix}/X11R6/bin \
-       RESDIR=$RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults
+       XINSTDIR=$RPM_BUILD_ROOT%{_bindir} \
+       RESDIR=$RPM_BUILD_ROOT%{_appdefsdir}
 
 install wavplay.1 $RPM_BUILD_ROOT%{_mandir}/man1
 echo ".so wavplay.1" > $RPM_BUILD_ROOT%{_mandir}/man1/wavrec.1
@@ -69,10 +75,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README BUGS
-%{_mandir}/man*/*
 %attr(755,root,root) %{_bindir}/wav*
+%{_mandir}/man*/*
 
 %files X11
 %defattr(644,root,root,755)
-%config %{_prefix}/X11R6/lib/X11/app-defaults/xltwavplay
-%attr(755,root,root) %{_prefix}/X11R6/bin/xltwavplay
+%attr(755,root,root) %{_bindir}/xltwavplay
+%{_appdefsdir}/xltwavplay